Fixed 'pickUp' and 'arrived' logic