Revise # of worker's values
Refactor