various changes for mvp