Improved on MainViewModel