[@Sho Minazuki] Changed as requested, let me know what you think?