Updated for V3.1 PCB