Massive improvfements to dfs