refactored vero integration
more changes