Rewrite of cl-project