Added O.vol. This needs a clean-up for other species...