Integration now performed in r, instead of psi