Core update

Tested and works. Wait till core patch is merged.