Inputs now do take item counts into account