slight refactor, bunnies fall