more changes to fsm