added colors
merged