I made some more code changes