added order id and improved pricing system
merge