mid ch 9 checkin
Merge branch 'updating-users'