fixing the arrival mechanism