Updated cpp