Added support for variable radii