Full update to include the chunky donut subtraction