All weights/volume recalibrated

Same logic as with the earlier pass.