update r2 to work with new architecture