Update for NMS