NEW: session management closes #6