Updating how CR is handled
Adding color coding