Reworked version for Kirby 2