Update to r3.1