Partial MDI rewrite