Reworking to implement MDI