Merging Ryuichiro's changes manually