Issue #118, edit routes and session id