added colors
merged
merged