more work on SessionManager