Changes to support weigh and pay