New and improved
Changed session around