Added pickup time enforcements.