incorporated Lingyi's suggestions