updated to work with v2 -- all tests passing