Updated to match FSM