Refactored to give new methods and simplified radius calculation