Updated class files

updated class files for the files Kyle modified