Fixed pack price breakdown and made it futureproof