enhancing session handling
enhancing session handling