Finishes up NAWQAAN-67