Took out all of the new stuff since it didn't work, and added more stuff