changed session handling