Modify on Shawn's comments