work on stub fall fsm
merged