Refactored MVP.