diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index b3f8bae0df..2d7cd49bd2 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -285,7 +285,8 @@ void RenderableGalaxy::update(const UpdateData& data) {
         _raycaster->setStepSize(_stepSize);
         _raycaster->setAspect(_aspect);
         _raycaster->setModelTransform(volumeTransform);
-        _raycaster->setTime(data.time);
+        // @EMIL: is this correct? ---abock
+        _raycaster->setTime(data.time.j2000Seconds());
     }
 }
 
diff --git a/modules/iswa/rendering/datacygnet.h b/modules/iswa/rendering/datacygnet.h
index fcd5f2389f..a24a7ed756 100644
--- a/modules/iswa/rendering/datacygnet.h
+++ b/modules/iswa/rendering/datacygnet.h
@@ -108,7 +108,7 @@ protected:
 
 private:
     bool readyToRender() const override;
-    bool downloadTextureResource(double timestamp = Time::ref().j2000Seconds()) override;
+    bool downloadTextureResource(double timestamp = OsEng.timeManager().time().j2000Seconds()) override;
 };
 
 } //namespace openspace
diff --git a/modules/iswa/rendering/iswacygnet.cpp b/modules/iswa/rendering/iswacygnet.cpp
index 491eeda6ac..7ef5c63a1d 100644
--- a/modules/iswa/rendering/iswacygnet.cpp
+++ b/modules/iswa/rendering/iswacygnet.cpp
@@ -185,8 +185,8 @@ void IswaCygnet::update(const UpdateData& data){
 
     // the texture resource is downloaded ahead of time, so we need to
     // now if we are going backwards or forwards
-    double clockwiseSign = (Time::ref().deltaTime()>0) ? 1.0 : -1.0;
-    _openSpaceTime = Time::ref().j2000Seconds();
+    double clockwiseSign = (OsEng.timeManager().time().deltaTime()>0) ? 1.0 : -1.0;
+    _openSpaceTime = OsEng.timeManager().time().j2000Seconds();
     _realTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch());
     _stateMatrix = TransformationManager::ref().frameTransformationMatrix(_data->frame, "GALACTIC", _openSpaceTime);
 
@@ -230,7 +230,7 @@ void IswaCygnet::unregisterProperties(){
 }
 
 void IswaCygnet::initializeTime(){
-    _openSpaceTime = Time::ref().j2000Seconds();
+    _openSpaceTime = OsEng.timeManager().time().j2000Seconds();
     _lastUpdateOpenSpaceTime = 0.0;
 
     _realTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch());
diff --git a/modules/iswa/rendering/screenspacecygnet.cpp b/modules/iswa/rendering/screenspacecygnet.cpp
index 997ec14f55..6583e12549 100644
--- a/modules/iswa/rendering/screenspacecygnet.cpp
+++ b/modules/iswa/rendering/screenspacecygnet.cpp
@@ -50,7 +50,7 @@ ScreenSpaceCygnet::ScreenSpaceCygnet(const ghoul::Dictionary& dictionary)
     _downloadImage = true;
     _url = IswaManager::ref().iswaUrl(_cygnetId);
         
-    _openSpaceTime = Time::ref().j2000Seconds();
+    _openSpaceTime = OsEng.timeManager().time().j2000Seconds();
     _lastUpdateOpenSpaceTime = _openSpaceTime;
 
     _realTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch());
@@ -70,13 +70,13 @@ ScreenSpaceCygnet::ScreenSpaceCygnet(const ghoul::Dictionary& dictionary)
 ScreenSpaceCygnet::~ScreenSpaceCygnet(){}
 
 void ScreenSpaceCygnet::update(){
-    _openSpaceTime = Time::ref().j2000Seconds();
+    _openSpaceTime = OsEng.timeManager().time().j2000Seconds();
     _realTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch());
 
     bool timeToUpdate = (fabs(_openSpaceTime-_lastUpdateOpenSpaceTime) >= _updateTime &&
                         (_realTime.count()-_lastUpdateRealTime.count()) > _minRealTimeUpdateInterval);
 
-    if((Time::ref().timeJumped() || timeToUpdate )){
+    if((OsEng.timeManager().time().timeJumped() || timeToUpdate )){
         _url = IswaManager::ref().iswaUrl(_cygnetId);
         updateTexture();
         _lastUpdateRealTime = _realTime;
diff --git a/modules/iswa/rendering/texturecygnet.h b/modules/iswa/rendering/texturecygnet.h
index 65351125be..151cbdb96a 100644
--- a/modules/iswa/rendering/texturecygnet.h
+++ b/modules/iswa/rendering/texturecygnet.h
@@ -43,7 +43,7 @@ public:
 protected:
 
     bool updateTexture() override;
-    bool downloadTextureResource(double timestamp = Time::ref().j2000Seconds()) override;
+    bool downloadTextureResource(double timestamp = OsEng.timeManager().time().j2000Seconds()) override;
     bool readyToRender() const override;
     bool updateTextureResource() override;