some improvments to the v1 to v2 path