Some changes to start dfs behavior