Final commit for this variant. Checked in for posterity