Restructured to use work orders