updated kirby and panel