After session 2 changes