updated with swatches