Changing more files since Chad can't handle the original changes.