properly setting staff_change flag