updated viewmodel and web service