merging in session 2 changes