Packing almost done. New/changed