Adding volume control (dirty version - needs cleaning)