code's breaking .. clean up session has to be done