Improved the volume system