move invalidation up into expiration and validation section