Bring code in line with ND