Add exact calculation and a cut-off r
Merge