diff --git a/main_scene_flow_impair.cpp b/main_scene_flow_impair.cpp
index e79975c..82c025b 100644
--- a/main_scene_flow_impair.cpp
+++ b/main_scene_flow_impair.cpp
@@ -66,12 +66,13 @@ int main(int num_arg, char *argv[])
 	bool imloaded = sceneflow.loadRGBDFrames();
 
 	if (imloaded == 1)
-	{
-		sceneflow.showImages();	
+	{	
 		sceneflow.solveSceneFlowGPU();
+		sceneflow.showImages();
 		sceneflow.showAndSaveResults();
 		sceneflow.freeGPUMemory();
         printf("\nPush any key over the scene flow image to finish\n");
+		cv::waitKey(0);
 	}
 
 	return 0;
diff --git a/scene_flow_impair.cpp b/scene_flow_impair.cpp
index 1254cc0..2b1b3d4 100644
--- a/scene_flow_impair.cpp
+++ b/scene_flow_impair.cpp
@@ -203,8 +203,6 @@ void PD_flow_opencv::showImages()
 	cv::namedWindow("Z2", cv::WINDOW_AUTOSIZE);
 	cv::moveWindow("Z2",dispx,dispy);
 	cv::imshow("Z2", depth2);
-
-	cv::waitKey(30);
 }
 
 bool PD_flow_opencv::loadRGBDFrames()
@@ -304,8 +302,6 @@ void PD_flow_opencv::showAndSaveResults()
 	cv::namedWindow("SceneFlow", cv::WINDOW_NORMAL);
     cv::moveWindow("SceneFlow",width - cols/2,height - rows/2);
 	cv::imshow("SceneFlow", sf_image);
-	cv::waitKey(100000);
-
 
 	//Save the scene flow as a text file 
 	char	name[100];