use new version of viewmodel