Some changes here. failed attempt to get auto session saving