Made EPIC changes
Merge pull request #1 from TomOffringa/toms-fix

Tom made some EPICCCC changes <3<3<3<3