Change to go with 2i AAE FSM refactor