-. change expiration management logic