Incorporate Teppei's comments