tweaked Quantity logic