Core update (snippet remix)