Took out some unneccesary stuff