WorkerState preformance improved
Final commit for now