changes to maintain session