After session 3 changes