updates to expiration analysis