adjusted some work session stuff
fixed merge conflict