Completed v-1 without testing