just a restore point (begin of dam -> ES version)
dam restructured (almost done)