use correct version of core lib
refactor worker