actually, pretty much everywhere we shouldn't be overriding the state, just merging it