Restructured + PCB v1 issues solved