Integrated more CL comments