Updates to match production at NCI