Refactored Volume.