Some problems with session setting

Commiting for backup