VN changes, still work in progress.