modified for bunny