rework on bunny class + new bunnies