make workers more robust
reorg