Improved visualizer