to leave and add occupants fixes
to leave and add occupants fixes