Updated with MVVM link