Make it packagable into single unit