Addressing cr suggestions