commented and added order_history stuff