V1 vdev

Addressed last comments.