Update aligned with Kaimonokago3