Rewriting the MVP design