Core-LOVE some little changes