New scary features! 

Made this a little bit more "thoric"