diff --git a/mechanical/wheel_assembly/README.md b/mechanical/wheel_assembly/README.md
index e707cbbe..863000f2 100644
--- a/mechanical/wheel_assembly/README.md
+++ b/mechanical/wheel_assembly/README.md
@@ -2,34 +2,18 @@
The wheel assembly attaches the wheels to the motors and mounts the motors to the rest of the rocker-bogie suspension system that makes up the robot chassis. These are relatively simple to assemble.
-![Wheels](images/wheels.png)
+
-## Features
+## [DollarHobbyz Traxxas Wheels only] Drilling the wheels
-* The flexible wheels allow for high traction as they deform around objects, improving climbing performance
-* Drive motors chosen to handle the high torque that the system sees, achieving both speed and climbing performance
+If you bought the DollarHobbyz Wheels, you will need to drill some holes through the plastic to allow attaching them to the hubs that fit onto the motor axes. If you have the smaller or bigger Wasteland Wheels from GoBilda, you can skip this step.
-### Mechanical Interface/Attachments to Rover
+The wheel is normally meant to be mounted using one bolt through the middle of the rim. This will not work well in our case as the rover sees very high torque at the wheel and the one-bolt system would be difficult to attach to any part of our system without the wheel slipping. To attach more firmly, we will drill two holes on either side of the original hole where we will mount the motor hub clamp
-* The 4 corner assemblies connect directly to the servo blocks on the rocker-bogies.
-* The 2 middle drive wheels attach directly to the rocker bogie
+Drill at least 2 holes in the wheels such that they can be mounted to the [Hyper Hub](https://www.gobilda.com/1310-series-hyper-hub-8mm-rex-bore/) that attaches to the motor shaft. You'll want to make sure the holes you drill are centered, otherwise the wheel will wobble while driving. Once you've found where to drill the holes, consider using a center punch or small drill bit first before drilling to ensure your drill bit doesn't start 'wandering' before it locks into position. The distance from each hole center to the center of the wheel is
+$$\sqrt(8^2 + 8^2) \approx 11.3mm$$
-## Machining/Fabrication
-
-**NOTE:** While the following approach is valid for v2, it is not ideal as it requires drilling. There may be better ways to attach to these wheels (or other wheels) without drilling. The only requirement is that the middle of the corner wheels aligns with the axis of rotation of the servo output shaft.
-
-**NOTE**: These instructions are a work in progress. Please ask for assistance on Slack.
-
-
-| item | ref | qty | img |
-| --------------------------------- | --- | --- | ------------------------------------------------------------------: |
-| wheels | S30 | 6 | |
-| hand drill or drill press | D3 | | |
-| center punch or starter drill bit | D7 | | |
-
-> The wheel is normally meant to be mounted using one bolt through the middle of the rim. This will not work well in our case as the rover sees very high torque at the wheel and the one-bolt system would be difficult to attach to any part of our system without the wheel slipping. To attach more firmly, we will drill two holes on either side of the original hole where we will mount the motor hub clamp as shown in Figure 1
-
-Drill at least 2 holes in the wheels such that they can be mounted to the [Sonic Hub](https://www.gobilda.com/1309-series-sonic-hub-8mm-rex-bore/) that attaches to the motor shaft.
+
## Assembly
@@ -47,8 +31,9 @@ Attach the clamping mount and REX bore hub to the motor. We will adjust their po
The result excluding wiring should look as follows:
-| ![corner assembly](images/corner_side.png) | ![corner mirroring](images/corner_mirror.png) |
-| ------------------------------------------ | --------------------------------------------- |
+| side view without wiring | one of two pairs of corner assemblies |
+| ---------------------------------------------- | ------------------------------------------------ |
+| | |
Note that the sides of the rover are mirrored and so you'll be building 2 pairs of similar but not exactly the same subassemblies, as shown in the right image above.
diff --git a/mechanical/wheel_assembly/images/corner_mirror.png b/mechanical/wheel_assembly/images/corner_mirror.png
index 66cc8d06..3fcbf7f4 100644
Binary files a/mechanical/wheel_assembly/images/corner_mirror.png and b/mechanical/wheel_assembly/images/corner_mirror.png differ
diff --git a/mechanical/wheel_assembly/images/corner_side.png b/mechanical/wheel_assembly/images/corner_side.png
index 79a37d54..5e5537cb 100644
Binary files a/mechanical/wheel_assembly/images/corner_side.png and b/mechanical/wheel_assembly/images/corner_side.png differ
diff --git a/mechanical/wheel_assembly/images/wheels.png b/mechanical/wheel_assembly/images/wheels.png
index 3be756aa..82cd58b7 100644
Binary files a/mechanical/wheel_assembly/images/wheels.png and b/mechanical/wheel_assembly/images/wheels.png differ
diff --git a/parts_list/bigger_wasteland.png b/parts_list/bigger_wasteland.png
new file mode 100644
index 00000000..9685492a
Binary files /dev/null and b/parts_list/bigger_wasteland.png differ
diff --git a/parts_list/extra_parts.md b/parts_list/extra_parts.md
index 53d5e478..b15eac54 100644
--- a/parts_list/extra_parts.md
+++ b/parts_list/extra_parts.md
@@ -71,15 +71,15 @@ You will want threadlocker for several screws so that they don't unscrew themsel
## Electrical
* Voltage Regulators:
- * **1 X** 5V Regulator: [Pololu] (https://www.pololu.com/product/2881)
+ * **1 X** 5V Regulator: [Pololu](https://www.pololu.com/product/2881)
* **1 X** 12V Regulator: [Pololu](https://www.pololu.com/product/2855)
* **1 X** PCA9685 corner: [Mouser](https://www.mouser.com/ProductDetail/Adafruit/815?qs=GURawfaeGuCGKbWyy9179Q%3D%3D)
* **3 X** Roboclaw 2x7A Motor Controller [Basic Micro](https://www.basicmicro.com/Roboclaw-2x7A-Motor-Controller_p_55.html)
* **1 X** Power Measurement Unit INA260: Sold out on DigiKey, possible replacements are on [Adafruit](https://www.adafruit.com/product/4226?gclid=CjwKCAjw5dqgBhBNEiwA7PryaLOm_zC9GhlzRH1NwN4bSRwDg84sIhSh3LEqTOrIvQ3j_kRBscTAYhoCBOQQAvD_BwE)
* **1 X** PCA9685 corner motor driver [Mouser](https://www.mouser.com/ProductDetail/Adafruit/815?qs=GURawfaeGuCGKbWyy9179Q%3D%3D)
-* DC power meter: [Amazon](https://www.amazon.com/gp/product/B017FSED9I/). This LCD display reads out current, voltage, power, and energy, and can be put on the back where the rectangular hole is in the laser cut cover.
+* DC power meter: [Amazon](https://www.amazon.com/gp/product/B017FSED9I/). This LCD display reads out current, voltage, power, and energy, and can be put on the back where the rectangular hole is in the laser cut cover.
* batteries: many options available here. We recommend getting LiPo batteries. You'll need a battery that can provide over 14V(*), so a 4s battery works well. You can get batteries with various mAh ratings (how many milliAmperes the battery can output for 1 hour). We recommend any option over 4000mAh. Higher capacity comes at a higher cost. You can also get more than one battery and swap them out. The rover can carry them as well.
- * Zeee sells many options [on Amazon](https://www.amazon.com/stores/page/25B7018D-26CC-4E43-BC6D-EFAF737D8F5E?ingress=2&visitId=1b4115fa-2240-424d-a0e6-a466830819ce&ref_=ast_bln)
+ * Zeee sells many options [on Amazon](https://www.amazon.com/stores/page/25B7018D-26CC-4E43-BC6D-EFAF737D8F5E?ingress=2&visitId=1b4115fa-2240-424d-a0e6-a466830819ce&ref_=ast_bln)
* You'll also need a charger for the battery. Make sure it can support the battery you bought. For the Zeee options, [this model from Amazon](https://www.amazon.com/Hobby-Fans-Professional-Balance-Discharger/dp/B09XC91BWJ/ref=sr_1_6?keywords=LiPo+charger&qid=1690484744&sr=8-6) will work.
* Consider getting a fireproof battery bag. LiPo batteries are extremely flammable/explosive and a fire caused by a battery is extremely difficult to put out.
* You'll also need a way to connect your battery to the PCB via a XT30 connector (MH-FC) which depends on the battery you get. Often these come with the charger for the battery
@@ -90,7 +90,11 @@ You will want threadlocker for several screws so that they don't unscrew themsel
## Different wheels
* The wheels we previously included as the default from [DollarHobbyz](https://www.dollarhobbyz.com/collections/all/products/traxxas-2-talon-tires-gemini-black-chrome-wheels-5374x) are $34.95 per pair of two for a total of $104.85 (excl. shipping), saving ~$135 compared to the default Wasteland wheels. They are a perfectly fine choice but require some drilling to fit to the motor hubs.
-* Gobilda also sells a larger version of the [Wasteland Wheel at 192mm diameter](https://www.gobilda.com/wasteland-wheel-192mm-diameter-72mm-width/). This adds $90 total compared to the default Wasteland wheels. No drilling is required.
+* Gobilda also sells a larger version of the [Wasteland Wheel at 192mm diameter](https://www.gobilda.com/wasteland-wheel-192mm-diameter-72mm-width/). This adds $90 total compared to the default Wasteland wheels. No drilling is required. Those wheels are bigger and wider and look like this:
+
+| smaller Wasteland wheels | bigger Wasteland wheels |
+| --- | --- |
+| | |
There is a software parameter where you can easily modify the size of the wheels to account for speed differences.
diff --git a/parts_list/screws.md b/parts_list/screws.md
index d851d679..2fd13a4a 100644
--- a/parts_list/screws.md
+++ b/parts_list/screws.md
@@ -1,13 +1,14 @@
-## Screws tally
+# Screws tally
All of the below are included in the [parts list](parts_list/README.md). This document is for maintenance only.
-### M4
+## M4
| subassembly | nb | length | type | purpose | multiplier | total |
| ------------ | --- | ---------------- | ------ | ------------------------------ | ---------- | ----- |
| wheel | 4 | 10 | either | motor - channel | 6 | 24 |
| wheel | 3 | 10 | button | bracket - vert. extrusion | 6 | 18 |
+| wheel | 3 | **10** or 12 | socket | wheel - motor axis clamp | 6 | 18 |
| corner | 3 | 10 | button | vert. extrusion - low channel | 4 | 12 |
| corner | 3 | 10 | button | low channel - servo shaft | 4 | 12 |
| corner | 3 | 10 | either | servo bracket - rocker | 4 | 12 |
@@ -42,11 +43,11 @@ Total per category and length:
| button | [10](https://www.gobilda.com/2802-series-zinc-plated-steel-button-head-screw-m4-x-0-7mm-10mm-length-25-pack/) | 70 (+48) | 3 |
| button | [16](https://www.gobilda.com/2802-series-zinc-plated-steel-button-head-screw-m4-x-0-7mm-16mm-length-25-pack/) | 34 | 2 |
| socket | [8](https://www.gobilda.com/2800-series-zinc-plated-steel-socket-head-screw-m4-x-0-7mm-8mm-length-25-pack/) | 30 (+8) | 2 |
-| socket | [10](https://www.gobilda.com/2800-series-zinc-plated-steel-socket-head-screw-m4-x-0-7mm-10mm-length-25-pack/) | 24 (+48) | 3 |
+| socket | [10](https://www.gobilda.com/2800-series-zinc-plated-steel-socket-head-screw-m4-x-0-7mm-10mm-length-25-pack/) | 42 (+48) | 4 |
| socket | [12](https://www.gobilda.com/2800-series-zinc-plated-steel-socket-head-screw-m4-x-0-7mm-12mm-length-25-pack/) | 20 | 1 |
| socket | [16](https://www.gobilda.com/2800-series-zinc-plated-steel-socket-head-screw-m4-x-0-7mm-16mm-length-25-pack/) | 28 (+8) | 2 |
| socket | [20](https://www.gobilda.com/2800-series-zinc-plated-steel-socket-head-screw-m4-x-0-7mm-20mm-length-25-pack/) | 12 | 1 |
Values between parentheses are the additional screws that would need to be ordered if all 'either' types with same length are used in that type. In general, socket screws are preferred because of their resistance to stripping and use of a larger hex key.
-The parts list also includes 1 [25-pack of M4 washers](https://www.gobilda.com/2801-series-zinc-plated-steel-washer-4mm-id-x-8mm-od-25-pack/), 1 [25-pack of M4 hex nuts](https://www.gobilda.com/2811-series-zinc-plated-steel-hex-nut-m4-x-0-7mm-7mm-hex-25-pack/), and 1 [25-pack of M4 locking hex nuts](https://www.gobilda.com/2812-series-zinc-plated-steel-nylon-insert-locknut-m4-x-0-7mm-7mm-hex-25-pack/).
\ No newline at end of file
+The parts list also includes 1 [25-pack of M4 washers](https://www.gobilda.com/2801-series-zinc-plated-steel-washer-4mm-id-x-8mm-od-25-pack/), 1 [25-pack of M4 hex nuts](https://www.gobilda.com/2811-series-zinc-plated-steel-hex-nut-m4-x-0-7mm-7mm-hex-25-pack/), and 1 [25-pack of M4 locking hex nuts](https://www.gobilda.com/2812-series-zinc-plated-steel-nylon-insert-locknut-m4-x-0-7mm-7mm-hex-25-pack/).
diff --git a/parts_list/smaller_wasteland.png b/parts_list/smaller_wasteland.png
new file mode 100644
index 00000000..dc516c5a
Binary files /dev/null and b/parts_list/smaller_wasteland.png differ