modify delivery_window to real datetime not tomorrow add allow subsituation function