Massive update; important: make infinite bunnies find correctly