More work on the Work Orders