diff --git a/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp b/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp
index bd9284cf53..a3f22690cb 100644
--- a/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp
+++ b/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp
@@ -536,7 +536,6 @@ void Rim2dIntersectionView::onCreateDisplayModel()
     if ( this->hasUserRequestedAnimation() )
     {
         if ( viewer() ) viewer()->setCurrentFrame( m_currentTimeStep );
-        onUpdateDisplayModelForCurrentTimeStep();
     }
 
     if ( this->viewer()->mainCamera()->viewMatrix() == sm_defaultViewMatrix )
diff --git a/ApplicationCode/ProjectDataModel/Rim3dView.cpp b/ApplicationCode/ProjectDataModel/Rim3dView.cpp
index e11b154d58..46b34cd897 100644
--- a/ApplicationCode/ProjectDataModel/Rim3dView.cpp
+++ b/ApplicationCode/ProjectDataModel/Rim3dView.cpp
@@ -479,24 +479,7 @@ void Rim3dView::setCurrentTimeStep( int frameIndex )
 void Rim3dView::setCurrentTimeStepAndUpdate( int frameIndex )
 {
     setCurrentTimeStep( frameIndex );
-
-    this->onUpdateDisplayModelForCurrentTimeStep();
-
-    if ( Rim3dView* depView = prepareComparisonView() )
-    {
-        depView->onUpdateDisplayModelForCurrentTimeStep();
-        depView->appendAnnotationsToModel();
-        depView->appendMeasurementToModel();
-
-        restoreComparisonView();
-    }
-
-    RimProject* project;
-    firstAncestorOrThisOfTypeAsserted( project );
-    project->mainPlotCollection()->updateCurrentTimeStepInPlots();
-
-    appendAnnotationsToModel();
-    appendMeasurementToModel();
+    updateDisplayModelForCurrentTimeStepAndRedraw();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -509,10 +492,14 @@ void Rim3dView::updateDisplayModelForCurrentTimeStepAndRedraw()
     if ( nativeOrOverrideViewer() )
     {
         this->onUpdateDisplayModelForCurrentTimeStep();
+        appendAnnotationsToModel();
+        appendMeasurementToModel();
 
         if ( Rim3dView* depView = prepareComparisonView() )
         {
             depView->onUpdateDisplayModelForCurrentTimeStep();
+            depView->appendAnnotationsToModel();
+            depView->appendMeasurementToModel();
 
             restoreComparisonView();
         }
@@ -530,6 +517,7 @@ void Rim3dView::updateDisplayModelForCurrentTimeStepAndRedraw()
             view->updateDisplayModelForCurrentTimeStepAndRedraw();
         }
     }
+
     m_isCallingUpdateDisplayModelForCurrentTimestepAndRedraw = false;
 
     RimProject* project;
@@ -569,7 +557,7 @@ void Rim3dView::createDisplayModelAndRedraw()
                 // But avoid any call back down to this Rim3dView, instead do the update manually to not confuse the
                 // m_currentTimeStep
                 nativeOrOverrideViewer()->caf::Viewer::slotSetCurrentFrame( currentTimeStep() );
-                depView->onUpdateDisplayModelForCurrentTimeStep();
+                depView->updateDisplayModelForCurrentTimeStepAndRedraw();
             }
 
             restoreComparisonView();