optmized and bug fixed
change comment