changes based on Li's comment