Quantity things fixed v1