Removing hard coded radius