Visualization rewrite complete