Sprint1: Core update charlie