Started fixing the session