Take yjacolin's review comments into account