latest version 20/4

before Niv's change to XML handler