Updated visualization
Merge conflict