Updates for PCBv7