Fujii's changes