formatting/testing/dfs changes