Fixing performance with global r_and_v.
Nope, old way was faster.