Manually merged my modified DSVL into an up-to-date github fork