merge with Carolyn's coloring(master)