need to fix ViewModel