Improve spill weight calculation