fix core, upgrade raw