more work on swatches