Updated to v3_4_6