En cours

Some amendments to form