bfs changes
merge