Added color conditionality and temporarily removed switch checking.