refactored pickup_time; considers weekends