V2 upgrades

Made changes stepping towards V2