Reverting back til v2 is working