core: move changes to the new version, make them similar