more packaging changes