minor improvements added work sharing but disabled it