Back to r3.1