setup sample order data
Merging jame changes into mine