Some changes for RadiusCalculator1.1