NFA logic moved to NFA (ROState dumbed down)