setup-volume.py - updated functions