added schema change
resolves merge conflict
adds expiration date and fixes fulfillment bug
fixes merge conflict