added workers
merged changes