D&S improvements