imported changes to nms/liga