Add volume and fix mixing bug