Overhaul and Kirby 2 upgrade