Tracking color better