added volume handling