Modif 1 and 2 completed