Update to new version of cl