changes to existing haircut room state machine