Volume checking

See commit comments