fixing expiration bugs
one more thing?