kusumoto's 2.1st commit