Fix from Aaron

Great update to stop crazy ton of findObjs() calls