diff --git a/hspm/api/core.py b/hspm/api/core.py
index fd21cc302f6579ab00f3e817118e4ca84e027c12..7905e396b08c409ccd855f2d0408d01773427ddd 100644
--- a/hspm/api/core.py
+++ b/hspm/api/core.py
@@ -39,6 +39,16 @@ def initHSPM(cfg):
 		cfg['aoa'] = 0
 	hspm.AoA = np.deg2rad(cfg['aoa'])
 
+	if not 'N_wake' in cfg:
+		print("HSPM Warning: N_wake not defined. Using default value of 100")
+		cfg['N_wake'] = 100
+	hspm.N_wake = cfg['N_wake']
+
+	if not 'L_wake' in cfg:
+		print("HSPM Warning: L_wake not defined. Using default value of 5")
+		cfg['L_wake'] = 5
+	hspm.L_wake = cfg['L_wake']
+
 	if not "meshType" in cfg:
 		print("HSPM Warning: meshType not defined. Using default cosine mesh (CosN)")
 		cfg['meshType'] = "CosN"
diff --git a/hspm/src/hspm.cpp b/hspm/src/hspm.cpp
index 55bc9e849202a875b625352c2afdaa59b96ca50b..832e73db03f9c31737bde7f10ec702347a8a84d7 100644
--- a/hspm/src/hspm.cpp
+++ b/hspm/src/hspm.cpp
@@ -17,11 +17,12 @@ void HSPM::initHSPM()
     V_y = V_inf * sin(AoA);
 
 
-    // TODO: Temporary
-    this->L_wake = 3 * chord;
-    this->N_wake = 100;
+    // TODO: Move somewhere else
     this->x_wake = Eigen::VectorXd::LinSpaced(N_wake+1, chord, L_wake+chord);
     this->y_wake = Eigen::VectorXd::Zero(N_wake+1);
+    for (size_t i=0; i<N_wake+1; i++) {
+        y_wake(i) = (x_wake(i)-chord) * tan(AoA);
+    }
     this->x_m_wake = Eigen::VectorXd::Zero(N_wake);
     this->y_m_wake = Eigen::VectorXd::Zero(N_wake);
     for (size_t i=0; i<N_wake; i++) {