Improved state management. Seems race free.
State gathering only needs to be run by one worker.