More NMS updates *fun*