Changes Combined

Had to put both your code and my code together into one.