spikymammal submitted- This is my first try at fixing, but this one almost copy-pasted itself. I mad