Incorporate Lei's comments