duplicate and inconsitent code for Swatches A-C, removed code ref #145