Condition for stopping changed to allow different displacements for returned and departed