More changes (I am bad at commit messages)