restructure to prep for fixity workers