expiration timing now a field, expiration now constant again instead of additive