More fsm work