revamp session management