refactoring, changed colors