I made some more changes