Updated to 1_7_R4