Somes changes about session , still need work