removing consecutive request to set session
merged changes