change expired? logic from 1 day to 30 minutes