Main cpp update