Moved r1 and r2 from let to where