Many changes done according to the notes