update on color and added text
merge