updated for kirby 2