temporary
Merge codes modified by Sho Aihara