Improve cl function