Sessions 2 updates
Fixed Merge conflicts