Improve virtuoso examples