I would have preferred this in a seperate commit, but that's a nitpick