fixed the code with Nathan
added back the commented code
Merge pull request #1 from scooterHat/working

fixed the code with Nathan