Following RC FSM changes