diff --git a/rev2/3d-models/top-dampener.scad b/rev2/3d-models/top-dampener.scad
index e7267f9..6e14a89 100644
--- a/rev2/3d-models/top-dampener.scad
+++ b/rev2/3d-models/top-dampener.scad
@@ -163,6 +163,7 @@ module case(){
                 cylinder(h=$shellWidth/2,r=$auxCableRadius );
             }
     }
+    //TODO: Continue aligning pico clearance
     module pico(){
         $topLeftEdgeOfPcbToCenterOfUsb = 27.7;
         $usbHoleWidth = 12;
@@ -172,16 +173,29 @@ module case(){
         $picoWidth = 25;
         $picoLength = 53;
         // Move to position along the wall the usb will be
-        translate([$topLeftEdgeOfPcbToCenterOfUsb - ($usbHoleWidth/2), $switchDistance * $rows, -$usbOffsetFromPcb]){
-            union() {
-                // Create a hole for the usb cable to go through
-                cube([$usbHoleWidth,$shellWidth,$usbHoleHeight]);
-                // Move inside the shell
-                translate([-(($picoWidth - $usbHoleWidth)/2),$clearance - $picoLength, +$usbOffsetFromPcb - $picoPcbClearanceFromBase])
-                    // Make clearance downwards for the pico board
-                    cube([$picoWidth,$picoLength, $picoLength]);
-                
-            }
+        translate([
+            $topLeftEdgeOfPcbToCenterOfUsb - ($usbHoleWidth/2), 
+            $switchDistance * $rows, 
+            -$usbOffsetFromPcb
+        ]){
+            // Create a hole for the usb cable to go through
+            cube([
+                $usbHoleWidth,
+                $shellWidth,
+                $usbHoleHeight
+            ]);
+            // Move inside the shell, nullify the usb clearance from pcb and move down according to pico clearance
+            translate([
+                -(($picoWidth - $usbHoleWidth)/2),
+                $clearance - $picoLength, 
+                +$usbOffsetFromPcb - $picoPcbClearanceFromBase
+            ])
+                // Make clearance downwards for the pico board
+                #cube([
+                    $picoWidth,
+                    $picoLength, 
+                    $picoPcbClearanceFromBase
+                ]);
         }
     }
     module shim(){
@@ -258,8 +272,6 @@ module pcb() {
     
 }
 
-    %pcb();
-color("#333333")
-    %topDampeners();
-color("#880000")
+    *%pcb();
+    *topDampeners();
     case();