Added state machine to status change's