merge recent v2 changes; migrating to v3