updated-session-handling