Merge Katherine's user/session changes