diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 80a7430..63a1c03 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="0aedafd8-e57e-462a-beda-65af0b91f3df" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/serve.py" beforeDir="false" afterPath="$PROJECT_DIR$/serve.py" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
@@ -44,13 +43,13 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="Dockerfile" value="16" />
-          <entry key="py" value="1326" />
+          <entry key="py" value="1357" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
           <entry key="Dockerfile" value="16" />
-          <entry key="Python" value="1326" />
+          <entry key="Python" value="1357" />
         </counts>
       </usages-collector>
     </session>
@@ -81,11 +80,11 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/serve.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="147">
-              <caret line="74" column="46" lean-forward="true" selection-start-line="74" selection-start-column="46" selection-end-line="74" selection-end-column="46" />
+            <state relative-caret-position="260">
+              <caret line="53" column="28" selection-start-line="53" selection-start-column="28" selection-end-line="53" selection-end-column="28" />
               <folding>
                 <element signature="e#18#46#0" expanded="true" />
-                <marker date="1588179731968" expanded="true" signature="5391:5665" ph="..." />
+                <marker date="1588180249558" expanded="true" signature="5697:5971" ph="..." />
               </folding>
             </state>
           </provider>
@@ -192,7 +191,7 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588179551169" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588180252829" />
     <property name="go.gopath.indexing.explicitly.defined" value="true" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -232,16 +231,15 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1588152877746</updated>
-      <workItem from="1588152880522" duration="16466000" />
+      <workItem from="1588152880522" duration="16973000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="16466000" />
+    <option name="totallyTimeSpent" value="16973000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1280" height="800" extended-state="0" />
-    <editor active="true" />
     <layout>
       <window_info id="Designer" order="0" />
       <window_info id="UI Designer" order="1" />
@@ -366,11 +364,11 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/serve.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="74" column="46" lean-forward="true" selection-start-line="74" selection-start-column="46" selection-end-line="74" selection-end-column="46" />
+        <state relative-caret-position="260">
+          <caret line="53" column="28" selection-start-line="53" selection-start-column="28" selection-end-line="53" selection-end-column="28" />
           <folding>
             <element signature="e#18#46#0" expanded="true" />
-            <marker date="1588179731968" expanded="true" signature="5391:5665" ph="..." />
+            <marker date="1588180249558" expanded="true" signature="5697:5971" ph="..." />
           </folding>
         </state>
       </provider>
diff --git a/serve.py b/serve.py
index ce0e7d4..c40bbb5 100644
--- a/serve.py
+++ b/serve.py
@@ -116,22 +116,27 @@ class Data:
 			self.config.test_data_path,
 			usecols=self.config.feature_and_label_columns
 		)
-		data, data_column_name = init_data.values, init_data.columns.tolist()
-		train_num = 0
-		mean = np.mean(data, axis=0)
-		std = np.std(data, axis=0)
-		norm_data = (data - mean) / std
-		start_num_in_test = 0
-
-		feature_data = norm_data[0:]
-		self.start_num_in_test = feature_data.shape[0] % self.config.time_step
+		norm_data = (init_data - self.mean) / self.std
+		feature_data = norm_data[:]
 		time_step_size = feature_data.shape[0] // self.config.time_step
 
-		test_x = [feature_data[start_num_in_test + i * self.config.time_step: start_num_in_test + (
+		test_x = [feature_data[0 + i * self.config.time_step: 0 + (
 				i + 1) * self.config.time_step]
 		          for i in range(time_step_size)]
 		if return_label_data:
-			label_data = norm_data[train_num + start_num_in_test:, self.config.label_in_feature_columns]
+			label_data = norm_data[0:, self.config.label_in_feature_columns]
+			return np.array(test_x), label_data
+		return np.array(test_x)
+
+		feature_data = self.norm_data[self.train_num:]
+		self.start_num_in_test = feature_data.shape[0] % self.config.time_step
+		time_step_size = feature_data.shape[0] // self.config.time_step
+
+		test_x = [feature_data[self.start_num_in_test + i * self.config.time_step: self.start_num_in_test + (
+				i + 1) * self.config.time_step]
+		          for i in range(time_step_size)]
+		if return_label_data:
+			label_data = self.norm_data[self.train_num + self.start_num_in_test:, self.config.label_in_feature_columns]
 			return np.array(test_x), label_data
 		return np.array(test_x)