Bringing the LITE branch up-to-date with NMS