Update to r7