Fixed some of Tylers stupidity