diff --git a/Apply.cpp b/Apply.cpp
new file mode 100644
index 0000000..72988bc
--- /dev/null
+++ b/Apply.cpp
@@ -0,0 +1,41 @@
+#include<stdio.h>
+#include<string.h>
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
+#pragma warning (disable:4996)
+#pragma warning(disable: 4819)
+int Apply(NewUser saved[N])
+{
+	static int count = 0;
+
+	while (1)
+	{
+
+		printf("ID : ");
+		scanf("%s", saved[count].ID);
+
+		printf("PW : ");
+		scanf("%s", saved[count].PW);
+		if (strlen(saved[count].PW) < 9)
+		{
+			printf("��й�ȣ�� 9�� �̻��̾�� �մϴ�.\n�ٽ� �Է��Ͻʽÿ�.\n\n");
+		}
+		else
+		{
+			printf("PW Ȯ��: ");
+			scanf("%s", saved[count].testPW);
+			if (!strcmp(saved[count].PW, saved[count].testPW))
+			{
+				getchar();
+				printf("======ȸ������ ���� :)======\n");
+				count++;
+
+				getchar();
+				return 0;
+			}
+			else
+				printf("WRONG // ��й�ȣ ��й�ȣ Ȯ�ΰ� �ٸ��ϴ�.\n");
+		}
+	}
+	printf("======ȸ������ ���� :(======\n");
+	return -1;
+}
\ No newline at end of file
diff --git a/BuildingPrint.cpp b/BuildingPrint.cpp
index bc54278..158f632 100644
--- a/BuildingPrint.cpp
+++ b/BuildingPrint.cpp
@@ -1,82 +1,37 @@
-#pragma warning (disable:4996)
-#include<stdio.h>
-#include<string.h>
-#include<stdlib.h>
-
-
-typedef struct TImeTable{
-	
-	char RoomNum;
-	
-	char BuildingName;
-
-}TimeTable;
-
-
-
-
-char BuildingPrint(TimeTable info, int ok)
-{
-	int ok;
-	(char*) info[ok];
-	int Building; 
-	int BuildingName;
-
-	printf("건물번호를 입력하세요: ");
-	scanf("%d", &(char*) info[ok].RoomNum);
-	Building = atoi((char*)info[ok].RoomNum);
-
-	printf("건물이름을 입력하세요: ");
-	scanf("%s", &BuildingName);
-	printf("Building==%d\nBuildingName==%s\n", Building, BuildingName );
-
-	
-}
-
-int main()
-{
-	int Building;
-	TimeTable info;
-	int ok;
-	BuildingPrint (info, ok);
-	
-	switch (Building)//Building:건물번호
-				//Case개수가 7개가 최대->모든 정보를 넣는 것에 제한
-				//대부분의 학생들의 시간표에 포함된 7개의 건물들로 할당
-	{
-	case 02:
-		printf("경상관\n");
-		break;
-	case 03:
-		printf("문화관\n");
-		break;
-
-	case 07:
-		printf("백마관\n");
-		break;
-
-
-		 case 11:
-			   printf("진리관\n");
-			   break;
-
-		   case 12:
-			   printf("조만식기념관\n");
-			   break;
-
-		   case 20:
-			   printf("미래관\n");
-			   break;
-
-		   case 21:
-			   printf("정보과학관\n");
-			   break;
-
-		   default:
-			   printf("해당하는 건물이름이 없습니다.");
-			   break;
-}
-
-
-	return 0;
-}
+#pragma warning (disable:4996)
+#include<stdio.h>
+#include<string.h>
+#include<stdlib.h>
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
+
+void BuildingSave(TimeTable info[N], int ok) {  
+	
+	//test :: strcpy(info[0].RoomNum, "21302");
+	//info[ok].UnivBuilding�� ����
+	//�ߺ����� ����Ǹ� �ƿ� ����� �� �Ǵ� ����
+	//Ž���� �Ἥ �ߺ��� �����ϸ� ���..
+
+	int Building[N]; 
+	char SSU[N][10] = { "" };
+	int i, j;
+	static int count = 0;
+
+	char b_num[2];
+
+	for (i = count; i < N; i++) {
+		for (j = 0; j < 2; j++)
+		{
+			b_num[j] = info[ok].RoomNum[j];
+		}
+		
+		Building[i] = atoi(b_num);
+		
+		printf("��ȣ %d�� �ǹ� �̸� �Է� : ", Building[i]);
+		scanf("%s", SSU[i]);
+		break;
+	}
+
+	count++;
+	strcpy(info[ok].UnivBuilding, SSU[ok]);
+
+}
diff --git a/DaySearch.cPP b/DaySearch.cPP
index 991fba9..e9ee6eb 100644
--- a/DaySearch.cPP
+++ b/DaySearch.cPP
@@ -2,49 +2,48 @@
 #include <string.h>
 #include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
 #pragma warning(disable:4996)
-//[DaySearch()] - ���Ϻ� �˻�
 
-//BuildingPrint(info, i); �� �� �� �ּ� ó��
-//SimpleRoomPrint(info, i); �� �� �� �ּ� ó��
-TimeTable info[N] = {
+extern void BuildingSave(TimeTable info[N], int ok);
+extern void SimpleRoomPrint(TimeTable info[N], int ok);
+extern void SearchList(TimeTable info[N]);
 
-	{ "�ڷᱸ��", "2150686201", "���ͼ�", "��", "0", "13:30 - 15:00" },
-{ "��ǻ�ͱ���", "2150686301", "����", "��", "0", "13:30 - 15:00" } };
+//������ �ϳ��ۿ� ���� �� �ϳ��� �ִ� ���� ��µǴ� ����
 
 void DaySearch(TimeTable info[N]) {
-	char WhatDay[5];
-	char ExitDay[2];
-	
+	char WhatDay[5] = "";
+	char Exit[5] = "";
 	int i;
+	int count;
 
-	while (1) {
+	count = 0;
 
-		printf("���� �Է�(ex.��) : ");
-		scanf("%s", WhatDay);
-		if (!strcmp(WhatDay, "��") == 0 && !strcmp(WhatDay, "ȭ") == 0 && !strcmp(WhatDay, "��") == 0 && !strcmp(WhatDay, "��") == 0 && !strcmp(WhatDay, "��") == 0 && !strcmp(WhatDay, "��") == 0 && !strcmp(WhatDay, "��") == 0)
-		{
-			printf("�߸� �Է��ϼ̽��ϴ�. �ٽ� �Է��Ͻʽÿ�.\n\n");
-			continue;
-		}
+	printf("(�������� e�� �Է��ϼ���)\n");
+	printf("�˻��� ����(ex.��) : "); //�� �� �ܾ� ĥ �� exception �ɾ�� �� ��
+	scanf("%s", WhatDay);
 
-		for (i = 0; i < N; i++) {
+	if (strcmp(WhatDay, "e") == 0) {
+		printf("e %d\n", count);
+		SearchList(info);
+	}
 
-			if (strcmp(WhatDay, "e") == 0) break;
-			else if (strcmp(WhatDay, info[i].DayOfWeek) == 0) {
-				printf("%d. %s %s %s %s %s\n", i + 1, info[i].SubjectName, info[i].SubjectNum, info[i].Prof, WhatDay, info[i].Time);
+	for (i = 0; i < N; i++) {
 
-			}
+		if (strcmp(WhatDay, info[i].DayOfWeek) == 0) {
 
+			printf("%d. %s / %s / %s / %s : %s / %s ", count + 1, info[i].SubjectName, info[i].SubjectNum, info[i].Prof, info[i].DayOfWeek, info[i].Time, info[i].UnivBuilding);
+			SimpleRoomPrint(info, i);
+			count++;
 		}
 
-		printf("�߰��Է��Ϸ��� �ƹ�Ű�� �Է�, �������� e �Է� :");
-		scanf("%s", ExitDay);
-		if (strcmp(ExitDay, "e") == 0) break;
-		printf("<�߰��� �Է��մϴ�>\n\n");
 	}
 
-}
-int main(void) {
-	DaySearch(info);
-	return 0;
+	printf("--------------------------\n");
+
+	printf("�߰��Է��Ϸ��� �ƹ�Ű�� �Է�, �������� e �Է� : ");
+	scanf("%s", Exit);
+	if (!strcmp(Exit, "e"))
+		SearchList(info);
+	else
+		DaySearch(info);
+
 }
\ No newline at end of file
diff --git a/Input.cpp b/Input.cpp
index ce584fa..84ac516 100644
--- a/Input.cpp
+++ b/Input.cpp
@@ -1,57 +1,58 @@
 #include <stdio.h>
-#define N 20;
 #pragma warning (disable:4996)
-// #include"C:\Users\남시현\Desktop\새 폴더 (2)\ciai03.h"
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
 
 /*
-	최종 제출 전
-	Input 함수로 바꿀 때 
-	int Input(TimeTable *info[N])
-	으로 바꿔야함
+	test ��
+	�ڷᱸ�� 2150189902 ���ͼ� ȭ�� 21203 12:00-13:15 �������а�
+	�ڷᱸ�� 2150189901 �ſ��� ���� 21201 15:00-16:15 �������а�
+	���α׷��ֱ��ʹ׽ǽ� 2150674203 ���ͼ� ���� 21201 15:00-16:15 �������а�
+	������ȭ 2150458401 �̿��� ȭ�� 11516 12:00-13:15 ������
+	�������м��̳� 5039992901 �̿��� �� 22661 15:00-16:15 ����Ʈ�ν���Ȧ
+	---�� ����Ʈ�ν���Ȧ61ȣ�� ��µ���..?
+
+	Building �Լ��� ����� �ʱ�ȭ ���� �ʴ� ����,,
+	�߰��� �����Ͻðڽ��ϱ�?
 */
+extern void BuildingSave(TimeTable info[N], int ok);
 
-typedef struct TimeTable {
-	char SubjectName[20];
-	char SubjectNum[10];
-	char Prof[10];
-	char DayOfWeek[5];
-	char RoomNum[5];
-	char Time[20];
-} TimeTable;
+void Input(TimeTable info[N]) {
 
-int Input(TimeTable info[]);
+	static int count = 0;
 
-int main() {
-	TimeTable info[20];
 
-	int a;
-	a = Input(info);
+	while (1) {
 
-}
+		printf("����� : ");
+		scanf("%s", info[count].SubjectName);
+		getchar();
 
-int Input(TimeTable info[]) {
-	int count = 0;
-	int *pcount = &count;
+		printf("�����ȣ : ");
+		scanf("%s", info[count].SubjectNum);
+		getchar();
 
-	printf("과목명: ");
-	scanf("%s", info[count].SubjectName);
+		printf("������ : ");
+		scanf("%s", info[count].Prof);
+		getchar();
 
-	printf("과목번호: ");
-	scanf("%s", info[count].SubjectNum);
+		printf("���� : ");
+		scanf("%s", info[count].DayOfWeek);
+		getchar();
 
-	printf("교수명: ");
-	scanf("%s", info[count].Prof);
+		printf("���ǹ�ȣ : ");
+		scanf("%s", info[count].RoomNum);
+		getchar();
 
-	printf("요일: ");
-	scanf("%s", info[count].DayOfWeek);
+		printf("���� �ð�:(ex.HH:MM-HH:MM) ");
+		scanf("%s", info[count].Time);
+		getchar();
 
-	printf("교실번호: ");
-	scanf("%s", info[count].RoomNum);
+		BuildingSave(info, count);
 
-	printf("수업시간: ");
-	scanf("%s", info[count].Time);
+		printf("===========================\n");
+		count++;
+		break;
+	}
 
-	(*pcount)++;
-
-	return 0;
-}
+	return;
+}
\ No newline at end of file
diff --git a/Login.cpp b/Login.cpp
new file mode 100644
index 0000000..8e7411e
--- /dev/null
+++ b/Login.cpp
@@ -0,0 +1,57 @@
+#include <stdio.h>
+#include <string.h>
+#pragma warning (disable:4996)
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
+
+int Login(NewUser saved[N]) {
+
+	static int i = 0;
+	static int find = 0;
+	char UserID[N] = "";
+	char UserPW[N] = "";
+
+	printf("======< ��� >======\n");
+
+	while (1) {
+		
+		printf("ID : ");
+		scanf("%s", UserID);
+
+		for (;; i++) {
+
+			if (strcmp(saved[i].ID, UserID) != 0) {
+				find = 0;
+
+				if (strcmp(saved[find].ID, UserID) != 0) {
+					printf("ID�� �������� �ʽ��ϴ�.\n");
+					printf("\n");
+					break;
+				}
+			
+			}
+			else {
+				find = i;
+
+				while (1) {
+
+					printf("PW : ");
+					scanf("%s", UserPW);
+
+					if (strcmp(saved[find].PW, UserPW) == 0)
+					{
+						printf("======��� ���� :)======\n");
+						return 0;
+					}
+					else
+						printf("======��� ���� :(======\n");
+						printf("WRONG // ��й�ȣ�� Ʋ�Ƚ��ϴ�.\n");
+						printf("\n");
+				}
+				break;
+			}
+
+		}
+
+	}
+	
+}
\ No newline at end of file
diff --git a/Main.cpp b/Main.cpp
new file mode 100644
index 0000000..d383aca
--- /dev/null
+++ b/Main.cpp
@@ -0,0 +1,89 @@
+#include<stdio.h>
+#include<string.h>
+#include<stdlib.h>
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
+#pragma warning(disable:4996)
+extern int Apply(NewUser saved[N]);
+extern int Login(NewUser saved[N]);
+extern int Menu(TimeTable info[N]);
+int ApplyCheck(NewUser saved[N], int *count);
+int LoginCheck(NewUser saved[N], int count);
+
+int main(void)
+{
+	//freopen("input.txt", "r", stdin);
+	NewUser saved[N];
+	TimeTable info[N];
+	while (1)
+	{
+		int count = 0;
+		int select = 0;
+		int apply = -1;
+		int login = -1;
+		int success = -1;
+
+
+		printf("1.ȸ������ �ϱ�\n");
+		printf("2.�α��� �ϱ�\n");
+		printf("3.�����ϱ�\n");
+		scanf("%d", &select);
+
+		if (select == 1)
+		{
+			
+			apply = Apply(saved);
+			
+			while (success == -1)
+				success = ApplyCheck(saved, &count);
+
+		}
+		else if (select == 2)
+		{
+			Login(saved);
+
+			while (success == -1)
+				success = LoginCheck(saved, count);
+			if (success == 0)
+				Menu(info);
+		}
+		else if (select == 3) {
+			printf("���α׷��� �����մϴ�.\n");
+			exit(-1);
+		}
+	}
+	getchar();
+	return 0;
+}
+int ApplyCheck(NewUser saved[N], int *count)
+{
+	char result[10];
+	printf("ȸ������ ������� �Է��ϼ��� (����/����): ");
+	scanf("%s", result);
+	if (!strcmp(result, "����"))
+	{
+		printf("ȸ������ ����\n");
+		*count++;
+		return 0;
+	}
+	else if (!strcmp(result, "����"))
+	{
+		printf("ȸ������ ����\n");
+		return -1;
+	}
+}
+int LoginCheck(NewUser saved[N], int count)
+{
+	char result[10];
+	printf("�α��� ������� �Է��ϼ��� (����/����): ");
+	scanf("%s", result);
+	if (!strcmp(result, "����"))
+	{
+		printf("===========================\n");
+		return 0;
+	}
+	else if (!strcmp(result, "����"))
+	{
+		printf("===========================\n");
+		return -1;
+	}
+}
diff --git a/Menu.cpp b/Menu.cpp
index 8d15624..d81976b 100644
--- a/Menu.cpp
+++ b/Menu.cpp
@@ -1,22 +1,16 @@
 #include <stdio.h>
-#define N 20;
 #pragma warning (disable:4996)
-#include"C:\Users\������\Desktop\�� ���� (2)\ciai03.h"
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
 
-int Menu(TimeTable info[]);
-int Input(TimeTable info[]);
-int SearchList();
+extern int main(void);
+extern void Input(TimeTable info[N]);
+extern void SearchList(TimeTable info[N]);
 
+int Menu(TimeTable info[N]) {
 
-int main() {
-	TimeTable info[20];
-	Menu(info);
-	return 0;
-}
-
-int Menu(TimeTable info[]) {
 	int MenuChoice;
 
+	while (1) {
 	printf("1. �ð�ǥ ����\n");
 	printf("2. �ð�ǥ �˻�\n");
 	printf("3. ����\n");
@@ -24,17 +18,18 @@ int Menu(TimeTable info[]) {
 
 	scanf("%d", &MenuChoice);
 
-	while (1) {
 		if (MenuChoice == 1) {
 			Input(info);
+			
 		} else if(MenuChoice == 2) {
-			SearchList();
+			SearchList(info);
+
 		} else if(MenuChoice == 3) {
 			printf("�������� ���ư��ϴ�.\n");
 			printf("\n");
-			break;
+			main();
 		}
 	}
 
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/ProfSearch.cpp b/ProfSearch.cpp
index b9af03f..e2b7699 100644
--- a/ProfSearch.cpp
+++ b/ProfSearch.cpp
@@ -1,56 +1,46 @@
-#include<stdio.h>
+#include<stdio.h> 
 #include<string.h>
-#include"C:\Users\sewon\Desktop\�� ����\ciai03.h"
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
+#pragma warning (disable:4996)
 
-//TimeTable info[N];
-//BuildingPrint(info,i);
-//SimpleRoomPrint(info,i);
-TimeTable info[N] = {
-	  {"�ڷᱸ��","215068620","���ͼ�","��","","13:30-14:45"},
-	  {"�ڷᱸ��","215068620","���ͼ�","��","","13:30-14:45"},
-	  {"���α׷���1","501023160","���ͼ�","ȭ","","10:00-11:50"},
-	  {"���α׷���1","501023160","���ͼ�","��","","10:00-11:50"} };
+extern void BuildingSave(TimeTable info[N], int ok);
+extern void SimpleRoomPrint(TimeTable info[N], int ok);
+extern void SearchList(TimeTable info[N]);
 
 void ProfSearch(TimeTable info[N]) {
-	int a, b, i, count = 0;
-	char end, WhoProf[10];
+
+	char WhoProf[10] = "";
+	char Exit[10] = "";
+	int i;
+	int count;
+
+	count = 0;
+
+	printf("(�������� e�� �Է��ϼ���)\n");
+	printf("�˻��� ������(ex.�̿���) : ");
+	scanf("%s", WhoProf);
+
+	if (strcmp(WhoProf, "e") == 0) {
+		SearchList(info);
+	}
+
 	for (i = 0; i < N; i++) {
-		printf("������ �Է�:");
-		scanf("%s", &WhoProf);
-		getchar();
-		for (a = 0; a < N; a++) {
-			for (b = a + 1; b < N + 1; b++) {
-				if (strcmp(WhoProf, info[b - 1].Prof) == 0) {
-					if (strcmp(info[a].SubjectNum, info[b].SubjectNum) == 0) {
-						count++;
-						printf("%d. %s / %s %s %s %s /", count, info[a].SubjectName, info[b - 1].DayOfWeek, info[b - 1].Time, info[b].DayOfWeek, info[b].Time);
-
-						//              BuildingPrint(info,i);
-						//              printf(" / ");
-						//              SimpleRoomPrint(info,i);
-						printf("\n");
-					}
-				}
-				/*else{
-					  printf("�߸� �Է��ϼ̽��ϴ�. �ٽ� �Է��Ͻʽÿ�.");
-					  break;}*/
-			}
-		}
-		printf("�߰��Է��Ϸ��� �ƹ� Ű�� �Է�(����), �������� e �Է�:\n");
-		scanf("%s", &end);
-		if (end != 'e') {
-			continue;
-		}
-		else {
-			break;
+
+		if (strcmp(WhoProf, info[i].Prof) == 0) {
+
+			printf("%d. %s / %s / %s / %s : %s / %s ", count + 1, info[i].SubjectName, info[i].SubjectNum, info[i].Prof, info[i].DayOfWeek, info[i].Time, info[i].UnivBuilding);
+			SimpleRoomPrint(info, i);
+			count++;
 		}
+
 	}
 
-}
+	printf("--------------------------\n");
 
-int main(void)
-{
-	ProfSearch(info);
-	getchar();
-	return 0;
+	printf("�߰��Է��Ϸ��� �ƹ�Ű�� �Է�, �������� e �Է� : ");
+	scanf("%s", Exit);
+	if (!strcmp(Exit, "e"))
+		SearchList(info);
+	else
+		ProfSearch(info);
 }
\ No newline at end of file
diff --git a/RoomNumSearch.cpp b/RoomNumSearch.cpp
index d897250..ed542a5 100644
--- a/RoomNumSearch.cpp
+++ b/RoomNumSearch.cpp
@@ -1,85 +1,47 @@
 //���� ��ȣ �˻� ���
 #include<stdio.h>
 #include<string.h>
-//#include "C:\Users\jonge\Desktop\ciai03.h"
-#pragma once
-#define N 20 //ȸ�� ���� �ο� ��, ���ڼ�, �ð�ǥ���� ���� �� ���� ���
-typedef struct NewUser {
-   char ID[N];
-   char PW[N];
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
+#pragma warning (disable:4996)
 
-} NewUser;
-typedef struct TimeTable {
-   char SubjectName[20];
-   char SubjectNum[20];
-   char Prof[10];
-   char DayOfWeek[5];
-   char RoomNum[6];
-   char Time[20]; //�Է� ���� ��, ���� ���� (ex. HH:MM - HH:MM)
-} TimeTable;
+extern void BuildingSave(TimeTable info[N], int ok);
+extern void SimpleRoomPrint(TimeTable info[N], int ok);
+extern void SearchList(TimeTable info[N]);
 
-//BuildingPrint(info, i);
-//SimpleRoomPrint(info, i);
-
-void RoomNumSearch(TimeTable info[N]);
+void RoomNumSearch(TimeTable info[N]) {
 
-int main(void) {
-	TimeTable info[N] = {
-		{"�ڷᱸ��", "2150686201", "���ͼ�", "��", "21302", "13:00-14:45"},
-	{"�ڷᱸ��", "2150685201", "���ͼ�", "��", "21302", "13:00-14:45"},
-	{"��ǻ�ͱ���", "2150686301", "�躴��", "��", "21302", "15:00-16:15"},
-	{"��ǻ�ͱ���", "2150686301", "�躴��", "��", "21302", "15:00-16:15"} };
-	RoomNumSearch(info);
+	char WhatRoom[6] = "";
+	char Exit[20] = "";
+	int i;
+	int count;
 
-}
-
-void RoomNumSearch(TimeTable info[N]) {
+	count = 0;
 
-	printf("���ǹ�ȣ �Է�: ");
-	char WhatRoom[6];
+	printf("(�������� e�� �Է��ϼ���)\n");
+	printf("�˻��� ���� ��ȣ(ex.21201) : ");
 	scanf("%s", WhatRoom);
 
 	if (strcmp(WhatRoom, "e") == 0) {
-		return;
+		SearchList(info);
 	}
 
-	for (int i = 0; i < N; i++) {
-		
+	for (i = 0; i < N; i++) {
+
 		if (strcmp(WhatRoom, info[i].RoomNum) == 0) {
-			for (int j = 0, p = 0; j < N, p < N; j++, p++) {
-				printf("%d. %s / ", p + 1, info[j].SubjectName);
-				for (int k = 0; k < N; k++) {
-					if (strcmp(info[j].SubjectName, info[k].SubjectName) == 0)
-						printf("%s: %s ", info[k].DayOfWeek, info[k].Time);
-				}
-				if (strcmp(info[j].SubjectName, info[j + 1].SubjectName) == 0)
-					j++;
-				printf("/ ");
-				//BuildingPrint(info, i);
-				printf(" ");
-				//SimpleRoomPrint(info, i);
-				printf("\n");
-				
-				if (strcmp(WhatRoom, info[j + 1].RoomNum) != 0)
-					break;
-			}
-			
 
-			printf("�߰� �Է��� �Ͻ÷��� �ƹ� Ű�� �Է��ϼ���. �������� e�� �Է��ϼ���: ");
-			scanf("%s", WhatRoom);
-			if (strcmp(WhatRoom, "e") == 0) {
-				break;
-			}
-			else {
-				RoomNumSearch(info);
-				break;
-			}
+			printf("%d. %s / %s / %s / %s : %s / %s ", count + 1, info[i].SubjectName, info[i].SubjectNum, info[i].Prof, info[i].DayOfWeek, info[i].Time, info[i].UnivBuilding);
+			SimpleRoomPrint(info, i);
+			count++;
 		}
 
-		else {
-			printf("�߸� �Է��ϼ̽��ϴ�. �ٽ� �Է��Ͻʽÿ�.\n");
-			RoomNumSearch(info);
-			break;
-		}
 	}
+
+	printf("--------------------------\n");
+
+	printf("�߰��Է��Ϸ��� �ƹ�Ű�� �Է�, �������� e �Է� : ");
+	scanf("%s", Exit);
+	if (!strcmp(Exit, "e"))
+		SearchList(info);
+	else
+		RoomNumSearch(info);
 }
diff --git a/SearchList.cpp b/SearchList.cpp
index 0e5b8e9..9e1e974 100644
--- a/SearchList.cpp
+++ b/SearchList.cpp
@@ -3,9 +3,19 @@
 #include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
 #pragma warning(disable:4996)
 
-void SearchList() {
+extern void SubjectNameSearch(TimeTable info[N]);
+extern void SubjectNumSearch(TimeTable info[N]);
+extern void ProfSearch(TimeTable info[N]);
+extern void DaySearch(TimeTable info[N]);
+extern void RoomNumSearch(TimeTable info[N]);
+extern int Menu(TimeTable info[N]);
+
+void SearchList(TimeTable info[N]) {
 
 	int ListChoice;
+	static int count = 0;
+
+	printf("===========================\n");
 
 	printf("1. ����� �˻�\n");
 	printf("2. �����ȣ �˻�\n");
@@ -15,28 +25,31 @@ void SearchList() {
 	printf("6. �޴��� ���ư���\n");
 
 	while (1) {
-		printf("��ȣ���� : \n");
+		printf("�˻��� ��ȣ ���� : \n");
 		scanf("%d", &ListChoice);
-		/*if (ListChoice == 1)
-			//SubjectNameSearch(info);
+
+		printf("===========================\n");
+
+		if (ListChoice == 1)
+			SubjectNameSearch(info);
 		else if (ListChoice == 2)
-			//SubjectNumSearch(info);
+			SubjectNumSearch(info);
 		else if (ListChoice == 3)
-			//ProfSearch(info);
+			ProfSearch(info);
 		else if (ListChoice == 4)
 			DaySearch(info);
-		/*else if (ListChoice == 5)
-			//RoomNumSearch(info);
+		else if (ListChoice == 5)
+			RoomNumSearch(info); 
 		else if (ListChoice == 6)
+		{
 			printf("<�޴�>\n");
+			Menu(info);
+		}
 		else
 			printf("�߸� �Է��߽��ϴ�. �ٽ� �Է��ϼ���.\n");
-			*/
+			
 	}
-}
-int main(void){
-	SearchList();
-	return 0;
 
+	return ;//(*pcount)++;
 
-}
\ No newline at end of file
+}
diff --git a/SimpleRoomPrint.cpp b/SimpleRoomPrint.cpp
new file mode 100644
index 0000000..db0bbbc
--- /dev/null
+++ b/SimpleRoomPrint.cpp
@@ -0,0 +1,16 @@
+#include <stdio.h>
+#include <stdlib.h>
+#pragma once
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
+
+void SimpleRoomPrint(TimeTable info[N], int ok) {
+
+	int SimpleRoom; 
+	char num[3]; 
+	for (int i = 0; i < 3; i++) 
+	{
+		num[i] = info[ok].RoomNum[i + 2];
+	}
+	SimpleRoom = atoi(num); 
+	printf("%dȣ\n", SimpleRoom);
+}
diff --git a/SubjectNameSearch.cpp b/SubjectNameSearch.cpp
new file mode 100644
index 0000000..d940260
--- /dev/null
+++ b/SubjectNameSearch.cpp
@@ -0,0 +1,51 @@
+#include <stdio.h>
+#include <string.h>
+#pragma warning (disable:4996)
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
+
+extern void BuildingPrint(TimeTable info[N], int ok);
+extern void SimpleRoomPrint(TimeTable info[N], int ok);
+extern void SearchList(TimeTable info[N]);
+void SubjectNameSearch(TimeTable info[N]);
+
+void SubjectNameSearch(TimeTable info[N]) {
+
+	char Lecture[20] = "";
+	char Exit[20] = "";
+	int i;
+	int count;
+
+
+		count = 0;
+
+		printf("(�������� e�� �Է��ϼ���)\n");
+		printf("�˻��� �����(ex.�ڷᱸ��) : ");
+		scanf("%s", Lecture);
+	
+
+		if (strcmp(Lecture, "e") == 0) {
+			SearchList(info);
+		}
+
+		for (i = 0; i < N; i++) {
+
+			if (strcmp(Lecture, info[i].SubjectName) == 0) {
+
+				printf("%d. %s / %s / %s / %s : %s / %s ", count + 1, info[i].SubjectName, info[i].SubjectNum, info[i].Prof, info[i].DayOfWeek, info[i].Time, info[i].UnivBuilding);
+				SimpleRoomPrint(info, i);
+				count++;
+			}
+
+		}
+
+		printf("--------------------------\n");
+
+		printf("�߰��Է��Ϸ��� �ƹ�Ű�� �Է�, �������� e �Է� : ");
+		scanf("%s", Exit);
+		if (!strcmp(Exit, "e"))
+			SearchList(info);
+		else
+			SubjectNameSearch(info);
+
+
+}
diff --git a/SubjectNumSearch.cpp b/SubjectNumSearch.cpp
new file mode 100644
index 0000000..b5b8dc2
--- /dev/null
+++ b/SubjectNumSearch.cpp
@@ -0,0 +1,43 @@
+#include<stdio.h>
+#include<string.h>
+#pragma once
+#pragma warning (disable:4996)
+#include "C:\Users\wjdal\source\repos\ciai_timetable0\ciai_timetable0\ciai03.h"
+
+extern void BuildingPrint(TimeTable info[N], int ok);
+extern void SimpleRoomPrint(TimeTable info[N], int ok);
+extern void SearchList(TimeTable info[N]);
+
+void SubjectNumSearch(TimeTable info[N]) {
+	
+	char LectureNum[20] = "";
+	char Exit[20] = "";
+	int i;
+
+	printf("(�������� e�� �Է��ϼ���)\n");
+	printf("�˻��� ���� ��ȣ(ex.2150189901) : ");
+	scanf("%s", LectureNum);
+
+	if (strcmp(LectureNum, "e") == 0) {
+		SearchList(info);
+	}
+
+	for (i = 0; i < N; i++) {
+
+		if (strcmp(LectureNum, info[i].SubjectNum) == 0) {
+
+			printf("%s / %s / %s / %s : %s / %s ", info[i].SubjectName, info[i].SubjectNum, info[i].Prof, info[i].DayOfWeek, info[i].Time, info[i].UnivBuilding);
+			SimpleRoomPrint(info, i);
+		}
+
+	}
+
+	printf("--------------------------\n");
+
+	printf("�߰��Է��Ϸ��� �ƹ�Ű�� �Է�, �������� e �Է� : ");
+	scanf("%s", Exit);
+	if (!strcmp(Exit, "e"))
+		SearchList(info);
+	else
+		SubjectNumSearch(info);
+}
\ No newline at end of file