adding the v2 changes & fixing a spacing issue