Upgrade to last viewflow