works with new session handler