Recursive changes to v2-alpha2