Lots of changes in session 1