here another attempt to merge the sourceparcellate changes into the blessed version