NHD Improvements