Rewritten CL signature part