updated state NMW state machine