Refactored so could color