Changes to Other Edit to account for two expiration dates