Small update
Ready to test new state machines