Improved tour and customer states