Made couple changes to the item class