Added colors
perf improvement