changed static core references