added coloring
merge
more merge