address CR issues