core modernization

core modernization