Core update

Wait until my core patch is merged