changing a lot to fix a lot