Integrated CR comments and reworked processing.