Madifications
Final version