progress with new Data Management (NC - not compilable)