Updated for more color coding