Changed to MVVM