working - need to test colors
merged-2