changed var names in Request, session changed a little