updating to use latest Core