Integrate CL suggestions