more work on session handler