Two step

Two step state machine configuration.