consistency updates, rewrite config to match