More Kirby conversion