Added color logic