Added radius. Probably need to do some refactoring