Rework after review CR-NAS-230