ScatterCore to core
other update