Revised many files to keep up with the class