improved order creation so that we don't create orders we loose track of