DS from MD generation enhanced (nearly ready)