little rejigging for packaging