diff --git a/ECTrainer2/ECTrainer.cpp b/ECTrainer2/ECTrainer.cpp
index 263d07e..3c74597 100644
--- a/ECTrainer2/ECTrainer.cpp
+++ b/ECTrainer2/ECTrainer.cpp
@@ -43,11 +43,13 @@
 	for (int i = 0; i < (int)PROC::NUM; i++) {
 		if (!_pProcs[i]->Init()) return false;
 	}
+	mwut::DebugPrintf(_T("Init done\n"));
 
 	// �X���b�h�J�n
 	for (int i = 0; i < (int)PROC::NUM; i++) {
 		if (i != (int)PROC::GUI) _pProcs[i]->Launch();
 	}
+	mwut::DebugPrintf(_T("Threading done\n"));
 	_pProcs[(int)PROC::GUI]->MainLoop();
 
 	// �X���b�h�I��
diff --git a/ECTrainer2/ECTrainer.h b/ECTrainer2/ECTrainer.h
index 4d35e1c..077416a 100644
--- a/ECTrainer2/ECTrainer.h
+++ b/ECTrainer2/ECTrainer.h
@@ -5,8 +5,8 @@
 #include <string>
 
 #define TOBII_ADDR "192.168.71.50"
-#define EYEDEVICE_GLASS2
-//#define EYEDEVICE_NONE
+//#define EYEDEVICE_GLASS2
+#define EYEDEVICE_NONE
 
 class BaseProcess;
 class ECTrainerGUI;
@@ -38,7 +38,7 @@
 	MOVIE_START,	// ������J�n
 	MOVIE_STOP,		// �������~
 	MOVIE_END,		// ������I��
-	IMAGE_SHOW,		// �摜�\��
+	//IMAGE_SHOW,		// �摜�\��
 	FB_OK,			// �t�B�[�h�o�b�N�FOK
 	FB_GOOD,		// �t�B�[�h�o�b�N�FGood
 	FB_NICE,		// �t�B�[�h�o�b�N�FNice
diff --git a/ECTrainer2/ECTrainerGUI.cpp b/ECTrainer2/ECTrainerGUI.cpp
index a8a6da8..4f42d5b 100644
--- a/ECTrainer2/ECTrainerGUI.cpp
+++ b/ECTrainer2/ECTrainerGUI.cpp
@@ -38,7 +38,6 @@
 		// �}���`���j�^�̏ꍇ
 		// �T�u��ʂɑ���p�l���\��
 		cv::moveWindow(WIN_MAIN, displays[1].left, displays[1].top);
-		_hWndMain = ::FindWindowA(NULL, WIN_MAIN.c_str());
 
 		// ���C����ʂɔ팱�҉f���񎦁iDirectShow���悪�T�u��ʂɏo�͂ł��Ȃ����߁j
 		cv::namedWindow(WIN_DISP, cv::WINDOW_NORMAL | cv::WINDOW_OPENGL);
@@ -54,6 +53,7 @@
 		_FullDispBuf.create(cv::Size(640, 480), CV_8UC3);
 		cv::moveWindow(WIN_MAIN, displays[0].left + 100, displays[0].top + 100);
 	}
+	_hWndMain = ::FindWindowA(NULL, WIN_MAIN.c_str());
 	_blank = cv::Mat(DISP_SIZE, CV_8UC3, cv::Scalar(0));
 	_Logo = cv::imread(HEADER_FILE);
 
@@ -135,21 +135,22 @@
 	cv::Mat dispResized = gocv::KeepAspectResize(dispBuf, DISP_SIZE.width);
 	cvui::image(_MainFrame, DISP_IMAGE_POS.x, DISP_IMAGE_POS.y, dispResized);
 
-	// �h������
-	if (_pEct->PStimulus()->IsNewMovie()) {
-		std::wstring movie = _pEct->PStimulus()->GetMovie();
-		if (movie.size() < 1 || movie == L"STOP") {
-			mwut::DebugPrintf(_T("ECTMSG::MOVIE_STOP  [%s]\n"), movie.c_str());
-			((BaseProcess*)_pEct->PWorker())->PostMsg(ECTMSG::MOVIE_STOP);
-		} else {
-			if (_pEct->PDSMovie()->PlayMovie(movie)) {
-				((BaseProcess*)_pEct->PWorker())->PostMsg(ECTMSG::MOVIE_START);
-			} else {
-				_pEct->PDSMovie()->StopMovie();
-				((BaseProcess*)_pEct->PWorker())->PostMsg(ECTMSG::SYSTEM_ERROR);
-			}
-		}
-	}
+	//// �h������
+	//if (_pEct->PStimulus()->IsNewMovie()) {
+	//	std::wstring movie = _pEct->PStimulus()->GetMovie();
+	//	//if (movie.size() < 1 || movie == L"STOP") {
+	//	//	mwut::DebugPrintf(_T("ECTMSG::MOVIE_STOP  [%s]\n"), movie.c_str());
+	//	//	((BaseProcess*)_pEct->PWorker())->PostMsg(ECTMSG::MOVIE_STOP);
+	//	//} else {
+	//		if (_pEct->PDSMovie()->PlayMovie(movie)) {
+	//			((BaseProcess*)_pEct->PWorker())->PostMsg(ECTMSG::MOVIE_START);
+	//		} else {
+	//			_pEct->PDSMovie()->StopMovie();
+	//			((BaseProcess*)_pEct->PWorker())->PostMsg(ECTMSG::SYSTEM_ERROR);
+	//		}
+	//	//}
+	//}
+
 	// ����̖����܂ōĐ��`�F�b�N
 	if (_pEct->PDSMovie()->IsReachToEnd()) {
 		((BaseProcess*)_pEct->PWorker())->PostMsg(ECTMSG::MOVIE_END);
@@ -188,15 +189,15 @@
 		break;
 
 	case (int)ECTMSG::MOVIE_START:
+		if (!_pEct->PDSMovie()->PlayMovie(_pEct->PStimulus()->GetMovie())) {
+			((BaseProcess*)_pEct->PWorker())->PostMsg(ECTMSG::SYSTEM_ERROR);
+		}
 		break;
 
 	case (int)ECTMSG::MOVIE_STOP:
 		_pEct->PDSMovie()->StopMovie();
 		break;
 
-	case (int)ECTMSG::IMAGE_SHOW:
-		break;
-
 	default:
 		//mwut::DebugPrintf(_T("Event %04X\n"), msg.message);
 		break;
diff --git a/ECTrainer2/StimData.txt b/ECTrainer2/StimData.txt
deleted file mode 100644
index ab5fab5..0000000
--- a/ECTrainer2/StimData.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-1 ../images/CalibCheck1.png 4 _ 0
-1 ../images/CalibCheck2.png 4 _ 0
-1 ../images/CalibCheck3.png 4 _ 0
-1 ../images/CalibCheck4.png 4 _ 0
-1 ../images/visit01_004.png 5 _ 0
-2 ../movies/visit01_004.avi 30 ../movies/visit01_004.csv 2
diff --git a/ECTrainer2/StimDataS.txt b/ECTrainer2/StimDataS.txt
deleted file mode 100644
index 0792ff8..0000000
--- a/ECTrainer2/StimDataS.txt
+++ /dev/null
@@ -1 +0,0 @@
-2 ../movies/visit01_004.avi 30 ../movies/visit01_004.csv 2
diff --git a/ECTrainer2/Stimulus.cpp b/ECTrainer2/Stimulus.cpp
index df3e470..7562f25 100644
--- a/ECTrainer2/Stimulus.cpp
+++ b/ECTrainer2/Stimulus.cpp
@@ -165,7 +165,6 @@
 		return false;
 	}
 	_Display.Put(img);
-	((BaseProcess*)_pEct->PECTrainerGUI())->PostMsg(ECTMSG::IMAGE_SHOW);
 	return true;
 }
 
diff --git a/ECTrainer2/Worker.cpp b/ECTrainer2/Worker.cpp
index db0d27f..2611107 100644
--- a/ECTrainer2/Worker.cpp
+++ b/ECTrainer2/Worker.cpp
@@ -215,6 +215,7 @@
 
 	case (int)ECTMSG::SYSTEM_ERROR: // ���̎h���Ɉړ�
 		this->EventLog(_T("System Error"));
+		_AppStatus = APP_STATUS::IDLE;
 		((BaseProcess*)_pEct->PStimulus())->PostMsg(ECTMSG::SYSTEM_ERROR);
 		((BaseProcess*)_pEct->PECTrainerGUI())->PostMsg(ECTMSG::MOVIE_STOP);
 		break;