Fixing few calcuations that were using diameter instead of radius