+ tweaked Accuracy optimisation
+ added CL adhoc support