improve performance and coloring