P1395 update changes before re-write