Update to r6 from r2