merging changes
color coding added