<pulkit/riya> pick_up_date refactored>