added lots of color stuff