Transitioned to state machine architecture