Need to handle time past the expiration