Added color swapping