PYCL adaptation II