Second push for the CL option [#31]