Visualizer improved 2.