Various prototype changes for round 7