Modify by Yamada