Add in upgrades from Chapter 5 Exercises