Covenant Rewrite