to leave and add occupants fixes