modifications to and tests of v3