merged changes Bertrand made to jcas-tmp with current iteration