Observer refactored to use StateMachine events
States events fixed