our changes from Session 2