Removed Version handing and updated to v1_7_R3