Improved FSM's
Merge branch 'test' into dev