adding latest changes to mvp