Changes to ND code