working on mvvm upgrade