updated vies and refactored