[CL] Fixed and tested. Still first goal to implement