Incorporated CL suggestions