some ref changes for mst