Update to new r2d2