updated NWT state machine