Some improvement for CL