changes by yuehui