Removed dependence on viewflow;