change expired to has_expired