Updated based on feedback from @burzum

I added back the pieces that I had removed and moved one or two bits around to fit around the new parts I had added.