changes for nms stuff