add sane session management