Changing expiry logic.