New colormap
Merging changes