Fix the queues and add orders