working on new fsm...