Change more with volume (refactor)