Sensible upgrade and inventory behaviour