Removed duplicate code for CL