Changed most functions to accept diameters and not volumes