Updating NMS to 1.6.1 - Part 2