Updated to NMS 1.6