fixed kirby's mess up