Changed core a bit