FSM finding ifworkers improvement