started working on sessions
fixed conflict