diff --git a/AMDiS/src/AdaptInfo.h b/AMDiS/src/AdaptInfo.h
index 24e01a68f7bc2fc5165f31f4a6ae5e5631038a5a..0479ea904eb11d0a5a9f3981107185644fc0d796 100644
--- a/AMDiS/src/AdaptInfo.h
+++ b/AMDiS/src/AdaptInfo.h
@@ -145,21 +145,11 @@ namespace AMDiS {
 	deserialized(false),
 	rosenbrockMode(false)
     {
-      Parameters::get( name_ + "->start time", startTime);
-      time = startTime;
-      Parameters::get(name_ + "->timestep", timestep);
-      Parameters::get(name_ + "->end time", endTime);
-      Parameters::get(name_ + "->max iteration", maxSpaceIteration);
-      Parameters::get(name_ + "->max timestep iteration", maxTimestepIteration);
-      Parameters::get(name_ + "->max time iteration", maxTimeIteration);
-      Parameters::get(name_ + "->min timestep", minTimestep);
-      Parameters::get(name_ + "->max timestep", maxTimestep);
-      Parameters::get(name_ + "->number of timesteps", nTimesteps);
-
+      init();
       char number[5];
       for (int i = 0; i < size; i++) {
-	sprintf(number, "[%d]", i);
-	scalContents[i] = new ScalContent(name + std::string(number)); 	
+  sprintf(number, "[%d]", i);
+  scalContents[i] = new ScalContent(name + std::string(number));  
       }
     }
 
@@ -167,9 +157,25 @@ namespace AMDiS {
     virtual ~AdaptInfo() 
     {
       for (unsigned int i = 0;  i < scalContents.size(); i++)
-	delete scalContents[i];
+  delete scalContents[i];
+    }
+
+    /// Sets initial values to time/timestep variables
+    inline void init()
+    {
+      Parameters::get(name + "->start time", startTime);
+      time = startTime;
+      Parameters::get(name + "->timestep", timestep);
+      Parameters::get(name + "->end time", endTime);
+      Parameters::get(name + "->max iteration", maxSpaceIteration);
+      Parameters::get(name + "->max timestep iteration", maxTimestepIteration);
+      Parameters::get(name + "->max time iteration", maxTimeIteration);
+      Parameters::get(name + "->min timestep", minTimestep);
+      Parameters::get(name + "->max timestep", maxTimestep);
+      Parameters::get(name + "->number of timesteps", nTimesteps);
     }
 
+    /// Resets all variables to zero (or something equivalent)
     inline void reset() 
     {
       spaceIteration = -1;
diff --git a/demo/init/bunny.init b/demo/init/bunny.dat.3d
similarity index 100%
rename from demo/init/bunny.init
rename to demo/init/bunny.dat.3d