fix core part a little