Back to NAF commitments
