working on CL build