Better heuristic
Merge branch 'feature/singleWorker'