Updated Visualization tool