updates for v06 joint - it runs but is not validated yet