Fixed up the scripts a bit so that v1 and v2 match