Updated to colors and mapping