Added color checking