removed miles of code for increased efficiency (you're welcome)