Refactored and tweked update times in the viewmodel.