master
Removed old implementation without state machine