Updated egg model