Yummy object hunting rewritten
merge that I'm not sure if I did right (sorry in advance)