proposition of modifications for tutorial 2