color logic changes