NICTD Improvements