Reverse previous commit and refactor session into one to rm duplication