Session Handled. Few changes done by Joshi.

Session has been handled. Some changes were done on my machine by Joshi.
Committed both code.