make the branch clean i.e. only modifications relative to tutorial 2