added virtuoso and fixed order