FIX: Better volume use