LingYunZhi's changes