format and comments change for CR