+ dz3 and small refactoring (missing files)