diff --git a/model/Rocket.cpp b/model/Rocket.cpp
index 486fa4c..d83535e 100644
--- a/model/Rocket.cpp
+++ b/model/Rocket.cpp
@@ -13,9 +13,12 @@ void Rocket::launch()
    std::vector<std::pair<double, double>> temp;
    temp.push_back(std::make_pair(0.0, 0.0));
    temp.push_back(std::make_pair(0.1, 10.0));
-   temp.push_back(std::make_pair(0.2, 50.0));
+   temp.push_back(std::make_pair(0.2, 100.0));
    temp.push_back(std::make_pair(1.2, 50.0));
    temp.push_back(std::make_pair(1.3, 0.0));
+   temp.push_back(std::make_pair(8.0, 0.0));
+   temp.push_back(std::make_pair(9.0, 100.0));
+   temp.push_back(std::make_pair(10.0, 0.0));
    tc.setThrustCurveVector(temp);
     propagator.runUntilTerminate();
 }
diff --git a/model/Thrustcurve.cpp b/model/Thrustcurve.cpp
index c7b954e..d693c84 100644
--- a/model/Thrustcurve.cpp
+++ b/model/Thrustcurve.cpp
@@ -29,12 +29,18 @@ void Thrustcurve::setThrustCurveVector(const std::vector<std::pair<double, doubl
    thrustCurve.clear();
    thrustCurve.resize(v.size());
    std::copy(v.begin(), v.end(), thrustCurve.begin());
+   maxTime = std::max_element(thrustCurve.begin(),
+                              thrustCurve.end(),
+                              [](const auto& a, const auto& b)
+                              {
+                                  return a.first < b.first;
+                              })->first;
 }
 
 void Thrustcurve::setIgnitionTime(double t)
 {
    ignitionTime = t;
-   maxTime += ignitionTime;
+   //maxTime += ignitionTime;
 }
 
 double Thrustcurve::getThrust(double t)