DDBNext-73 Done with some refinements to be apllyed