FSM Progress
FSM Improvements
more stuffs