DVS revamped (and probably better working)