Upated for session 2