updated for color and shade