Adjustments for new ngc scheme