Update the way eggs are found and evaluated