Core update (peppermint remix)