Revert "Revert "MVC edits ~ IOD optimization.""

This reverts commit a9f0862b5b22692f8665ad4804bf20925293dbbf.
Revert "Revert "Revert "MVC edits ~ IOD optimization."""

This reverts commit bede3cf74b77308eafb297cd4c0b890455fb6fec.