Updated for new color implementation