changes related to mvvm