Now radius parametric, closes #2.