Added new VAD and refactoring