Moved viz to top level