viewmodel and model changes-Dhiraj