improved version of the worker-class