Workin on sessions. Some modifications