Improved volume logic