Changed diameter to be non-static
Fixed merge issue