diff --git a/Makefile b/Makefile
index ee45e0f..4b997b3 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ RM=rm -f
 PDF_PWD=rdkRq8u8lAzARCIPa8Us
 
 # files to compile
-files := $(wildcard *.tex) ntuthesis.cls thesis.bib
+files := $(wildcard *.tex) nctuthesis.cls thesis.bib
 # content files
 files := $(files) $(wildcard chapters/*.tex) $(wildcard tables/*.tex) $(wildcard figures/*.tex)
 # embeded files
@@ -26,7 +26,7 @@ $(MAIN).pdf: $(files) src/without-watermark.tex
 	$(LATEX) $(MAIN)
 	$(RM) watermark.tex
 
-ntulib: pdfs/watermark.pdf src/with-watermark.tex $(files)
+nctulib: pdfs/watermark.pdf src/with-watermark.tex $(files)
 	cp src/with-watermark.tex watermark.tex
 	$(LATEX) $(MAIN)
 	$(BIBTEX) $(MAIN)
@@ -39,7 +39,7 @@ pdfs:
 	mkdir pdfs
 
 pdfs/watermark.pdf: | pdfs
-	curl "http://etds.lib.ntu.edu.tw/files/watermark.pdf" -o "pdfs/watermark.pdf"
+	curl "http://www.lib.nctu.edu.tw/attach/download/id-163/" -o "pdfs/watermark.pdf"
 
 clean:
 	$(RM) *.log *.aux *.dvi *.lof *.lot *.toc *.bbl *.blg *.out
diff --git a/README.md b/README.md
index d8fd01d..abfa6d7 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,21 @@
-臺灣大學碩博士論文 XeLaTeX 模版
+交通大學碩博士論文 XeLaTeX 模版
 ==========
 
 
 前言
 ----------
 
-這個模版的前身是 [tzhuan](http://github.com/tzhuan) 的
+這個模版的前身是 [shaform](http://github.com/shaform) 的 [臺灣大學碩博士論文 XeLaTeX 模版](https://github.com/shaform/ntu-thesis) 與 [tzhuan](http://github.com/tzhuan) 的
 [臺灣大學碩博士論文 XeLaTeX 模板](https://github.com/tzhuan/ntu-thesis)。
 同時也整合了一些 [qcl](https://github.com/qcl) 針對
 [qcl-master-thesis](https://github.com/qcl/qcl-master-thesis) 所做的修改。
 其中,他也參考了 [台大碩博士論文LaTeX範本](https://code.google.com/p/ntu-thesis-latex-template/)。
-最後則由 [shaform](https://github.com/shaform) 在撰寫論文期間又做了些許更動。
+最後則由 [Po-haoHuang](https://github.com/Po-haoHuang) 在交通大學撰寫論文期間又做了些許更動,使其成為適合交通大學的模板。
 
 
 下載
 ----------
-您可以直接 clone 這個 git repository,或者您可以在[這裡](https://github.com/shaform/ntu-thesis/releases)下載發行版本。
+您可以直接 clone 這個 git repository [點這裡](https://github.com/Po-haoHuang/nctu-thesis)。
 
 
 說明
@@ -23,25 +23,7 @@
 請參考 [wiki](https://github.com/shaform/ntu-thesis/wiki) 的說明。
 
 
-Changelog
+備註
 ----------
-  * v1.0
-    * The first fork release
-    * Add Chinese support
-    * Add NTU watermark & password protection
-    * Add certification and spine .docx files
-    * Add setup
-    * Add hypertext links in the document
-    * Adjust line spacing
-  * v0.4
-    * Rename \year, \month and \day to avoid the conflicts. Thanks to [shaform](https://github.com/shaform).
-  * v0.3.1
-    * Fix issue #2, thanks to [BachiLi](https://github.com/BachiLi).
-  * v0.3
-    * Fix issue #1, thanks to [simonxander](https://github.com/simonxander).
-	* Set doublespacing by default, add singlespacing and onehalfspacing support.
-	* Refine the cover page and the certification.
-  * v0.2
-    * Add proposal support
-  * v0.1
-    * The first release
+本模板的使用編譯是在[Overleaf](https://www.overleaf.com)線上服務的環境上執行,本地端編譯或是Makefile檔裡面的指令都未經測試。
+參考文獻可利用Google學術搜尋的導入bibtex。
\ No newline at end of file
diff --git a/abstract.tex b/abstract.tex
index 59a0136..1da90b8 100644
--- a/abstract.tex
+++ b/abstract.tex
@@ -1,27 +1,24 @@
 \begin{abstractzh}
-這是中文行距測試,應該看到一點五倍行距。這是中文行距測試,應該看到一點
-五倍行距。這是中文行距測試,應該看到一點五倍行距。這是中文行距測試,應
-該看到一點五倍行距。這是中文行距測試,應該看到一點五倍行距。這是中文行
-距測試,應該看到一點五倍行距。這是中文行距測試,應該看到一點五倍行距。
-這是中文行距測試,應該看到一點五倍行距。這是中文行距測試,應該看到一點
-五倍行距。這是中文行距測試,應該看到一點五倍行距。這是中文行距測試,應
-該看到一點五倍行距。這是中文行距測試,應該看到一點五倍行距。這是中文行
-距測試,應該看到一點五倍行距。這是中文行距測試,應該看到一點五倍行距。 \\
+這是摘要這是摘要
 
+這是摘要這是摘要
+
+這是摘要這是摘要
+
+這是摘要這是摘要\\
+\newline
 \noindent
-關鍵字:台大、公館、羅斯福路、德田館
+關鍵字:這是摘要、這是摘要、這是摘要、這是摘要、這是摘要
 \end{abstractzh}
 
+
+
 \begin{abstracten}
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text. \\
+This is abstract.This is abstract.
+
+This is abstract.This is abstract.
+\\
 
 \noindent
-Keywords: NTU, Gongguan, Roosevelt Road, DerTian Hall
+Keywords: test, test, test, test, test
 \end{abstracten}
diff --git a/acknowledgements.tex b/acknowledgements.tex
index e639687..ab6b033 100644
--- a/acknowledgements.tex
+++ b/acknowledgements.tex
@@ -1,25 +1,18 @@
 \begin{acknowledgementszh}
-這是中文行距測試,應該看到一點五倍行距。這是中文行距測試,應該看到一點
-五倍行距。這是中文行距測試,應該看到一點五倍行距。這是中文行距測試,應
-該看到一點五倍行距。這是中文行距測試,應該看到一點五倍行距。這是中文行
-距測試,應該看到一點五倍行距。這是中文行距測試,應該看到一點五倍行距。
-這是中文行距測試,應該看到一點五倍行距。這是中文行距測試,應該看到一點
-五倍行距。這是中文行距測試,應該看到一點五倍行距。這是中文行距測試,應
-該看到一點五倍行距。這是中文行距測試,應該看到一點五倍行距。這是中文行
-距測試,應該看到一點五倍行距。這是中文行距測試,應該看到一點五倍行距。
+假的,什麼都是假的,畢業才是真的
 
-感謝\ldots
 \end{acknowledgementszh}
 
-\begin{acknowledgementsen}
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
+% 自行決定是否需英文摘要
+% \begin{acknowledgementsen}
+% This is English line spacing test. You should see double spacing text.
+% This is English line spacing test. You should see double spacing text.
+% This is English line spacing test. You should see double spacing text.
+% This is English line spacing test. You should see double spacing text.
+% This is English line spacing test. You should see double spacing text.
+% This is English line spacing test. You should see double spacing text.
+% This is English line spacing test. You should see double spacing text.
+% This is English line spacing test. You should see double spacing text.
 
-I'm glad to thank\ldots 
-\end{acknowledgementsen}
+% I'm glad to thank\ldots 
+% \end{acknowledgementsen}
diff --git a/chapters/conclusion.tex b/chapters/conclusion.tex
index 481b43b..84afcb6 100644
--- a/chapters/conclusion.tex
+++ b/chapters/conclusion.tex
@@ -1,2 +1,20 @@
-\chapter{Conclusions}
+\chapter{結論與建議}
 \label{c:conclusion}
+\section{實驗結果討論}
+測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業
+
+\subsection{綜合討論}
+
+測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業
+
+
+
+\section{其他實驗結果討論}
+
+
+
+
+
+\section{總結與未來建議}
+
+\section{研究限制}
diff --git a/chapters/dataset.tex b/chapters/dataset.tex
deleted file mode 100644
index 086ea1c..0000000
--- a/chapters/dataset.tex
+++ /dev/null
@@ -1,2 +0,0 @@
-\chapter{Datasets}
-\label{c:dataset}
diff --git a/chapters/experiment.tex b/chapters/experiment.tex
index 978dea8..f1f2434 100644
--- a/chapters/experiment.tex
+++ b/chapters/experiment.tex
@@ -1,26 +1,26 @@
-\chapter{Experiments}
+\chapter{實驗結果}
 \label{c:experiment}
 
-There is a tree in Figure~\ref{i:tree}.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
+\section{描述性統計}
+本研究各變數實驗結果之描述性統計(個數、最小值、最大值、平均與標準差)如表~\ref{4-0}。
 
-%i:tree
-\input{figures/tree}
+\input{tables/4-0.tex}
+
+
+\section{實驗結果分析}
+
+如表~\ref{4-4},以雙獨立樣本t檢定檢驗...
+
+\input{tables/4-4.tex}
+
+
+
+
+
+如表~\ref{4-9}所示...
+
+\input{tables/4-9.tex}
 
-There is a barchart in Figure~\ref{i:barchart}.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
 
-%i:barchart
-\input{figures/barchart}
 
-Our method outperforms state-of-art systems as shown in Table~\ref{t:results}.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
 
-%t:results
-\input{tables/results}
diff --git a/chapters/introduction.tex b/chapters/introduction.tex
index 5935c0f..c0c6371 100644
--- a/chapters/introduction.tex
+++ b/chapters/introduction.tex
@@ -1,12 +1,35 @@
-\chapter{Introduction}
+\chapter{緒論}
 \label{c:intro}
+\section{研究動機}
 
-Recently a cat appears in NTU as shown in Figure~\ref{i:cat}.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
+交大\cite{test1999}提出了「假的」學說,說明畢業才是真的~\citep{test1999}
+
+測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業
+
+\section{研究背景}
+\subsection{測試測試}
+
+
+\section{研究目標}
+\begin{enumerate}
+\item 想辦法畢業
+\item 想辦法畢業
+\item 想辦法畢業
+\item 想辦法畢業
+\end{enumerate}
+\section{研究問題}
+整合上述,本研究想要想辦法畢業:
+
+\noindent
+想辦法畢業:
+\begin{enumerate}
+\label{q1}
+\item 想辦法畢業?
+\end{enumerate}
+
+
+
+\section{研究重要性} 
+想辦法畢業
 
-%i:cat
-\input{figures/cat}
 
-As \cite{o2014cats} pointed out, there were many videos~\citep{o2014cats}.
diff --git a/chapters/method.tex b/chapters/method.tex
index d6df66b..7c9c9d0 100644
--- a/chapters/method.tex
+++ b/chapters/method.tex
@@ -1,22 +1,29 @@
-\chapter{Methods}
-\label{c:method}
-
-Our method is described in Algorithm~\ref{a:a1}.
-
-\begin{algorithm}
-    \caption{A Very Good Algorithm}
-    \label{a:a1}
-    \begin{algorithmic}[1]
-        \Require  
-            $I$: Something;
-        \Ensure
-            $O$: Something else;
-        \State $S\gets$[]
-        \Comment{Initialize $S$}
-        \ForAll{Item $i$ {\bf in} $I$ }
-            \State $S\gets$[]
-            \Comment{Another comment}
-        \EndFor
-        \State \Return O
-    \end{algorithmic}
-\end{algorithm}
+\chapter{研究方法}
+\section{研究設計與流程}
+測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業
+
+本研究吉祥物如圖~\ref{i:cat}。
+\input{figures/cat}
+
+樹範例如~\ref{i:tree}
+\input{figures/tree}
+
+長條圖範例如~\ref{i:barchart}
+\input{figures/barchart}
+
+
+本研究分組如表~\ref{t:group}
+\input{tables/group}
+
+
+
+
+
+
+    
+
+
+
+
+
+
diff --git a/chapters/otherbib.tex b/chapters/otherbib.tex
new file mode 100644
index 0000000..225df06
--- /dev/null
+++ b/chapters/otherbib.tex
@@ -0,0 +1,6 @@
+\clearpage
+\appendix
+\centering{\huge{附錄}}
+\label{appendix}
+
+測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業
\ No newline at end of file
diff --git a/chapters/related.tex b/chapters/related.tex
index 9c8ea6c..7d172aa 100644
--- a/chapters/related.tex
+++ b/chapters/related.tex
@@ -1,49 +1,9 @@
-\chapter{Related Work}
-\label{c:related}
+\chapter{文獻探討}
 
-\section{First}
-\label{s:related1}
+\section{好想畢業}
+
+
+測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業測試文字我想畢業
 
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
 
-\section{Second}
 
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-This is English line spacing test. You should see double spacing text.
-As discussed in Section~\ref{s:related1} and Chapter~\ref{c:related}.
diff --git a/figures/cat.tex b/figures/cat.tex
index ad2be7a..5ba5522 100644
--- a/figures/cat.tex
+++ b/figures/cat.tex
@@ -1,6 +1,6 @@
 \begin{figure}[!htbp]
 \centering
-\includegraphics[width=0.58\textwidth]{images/cat}
+\includegraphics{images/cat}
 \caption{A cat.}
 \label{i:cat}
 \end{figure}
diff --git a/images/cat.jpg b/images/cat.jpg
index b6be3d2..80c1c28 100644
Binary files a/images/cat.jpg and b/images/cat.jpg differ
diff --git a/ntuthesis.cls b/nctuthesis.cls
similarity index 73%
rename from ntuthesis.cls
rename to nctuthesis.cls
index c5005a3..85c5611 100644
--- a/ntuthesis.cls
+++ b/nctuthesis.cls
@@ -1,4 +1,4 @@
-% author: Tz-Huan Huang [http://www.csie.ntu.edu.tw/~tzhuan]
+% author: Po-Hao Huang [https://github.com/Po-haoHuang]
 
 % ----------------------------------------------------------------------------
 % "THE CHOCOLATE-WARE LICENSE":
@@ -8,7 +8,7 @@
 % ----------------------------------------------------------------------------
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{ntuthesis}[2013/04/23 Thesis template for National Taiwan University]
+\ProvidesClass{nctuthesis}[2016/08/03 Thesis template for National Chiao Tung University]
 
 % Derived from book class
 \DeclareRobustCommand{\@typeen}{Master}
@@ -29,7 +29,7 @@
 \LoadClass[a4paper,12pt,oneside]{book}
 
 % Required packages
-\RequirePackage[top=3cm,left=3cm,bottom=2cm,right=3cm]{geometry}
+\RequirePackage[top=2.5cm,left=2.5cm,bottom=2.5cm,right=2.5cm]{geometry}
 \RequirePackage{xeCJK}
 \RequirePackage{setspace}
 \RequirePackage{titlesec}
@@ -61,72 +61,72 @@
 
 \DeclareRobustCommand{\clearpages}{\if@openright\cleardoublepage\else\clearpage\fi}
 
-\DeclareRobustCommand{\makecover}{
-  \begin{titlepage}
-    \vspace{1cm}
-    \begin{singlespace}
-    \begin{center}
-      \fontsize{18}{27}\selectfont
-      \@universityzh\@collegezh\@institutezh\par
-        \@typezh{}\@classzh\par
-      {\fontsize{14}{21}\selectfont
-        \@instituteen\par
-        \@collegeen\par}
-      {\fontsize{16}{24}\selectfont
-        \@universityen\par
-        \@typeen{} \@classen\par}
-      \vspace{\fill}
-      \@titlezh\par
-      \@titleen\par
-      \vspace{\fill}
-      \@authorzh\\
-      \@authoren\par
-      \vspace{2cm}
-      指導教授:\@advisorzh\\
-      Advisor: \@advisoren\par
-      \vspace{1.5cm}
-      中華民國 \@yearzh 年 \@monthzh 月\\
-      \@monthen, \@yearen
-    \end{center}
-    \end{singlespace}
-    \vspace{1cm}
-  \end{titlepage}
-}
-
-
-\DeclareRobustCommand{\makecertification}{
-  \clearpages
-  \begin{singlespace}
-  \begin{center}
-    \fontsize{24}{36}\selectfont\@universityzh\@typezh{}學位\@classzh\\
-    口試委員會審定書\par
-    \vspace{0.5cm}
-    {\fontsize{20}{30}\selectfont\@titlezh\par\@titleen\par}
-  \end{center}
-  \addcontentsline{toc}{chapter}{口試委員會審定書}
-  \vspace{1cm}
-  \fontsize{15}{24}\selectfont
-\hspace{30pt}本論文係\@authorzh{}君 (\@studentid)
-在\@universityzh\@institutezh{}完成之\@typezh{}學位\@classzh,%
-於民國 \@yearzh 年 \@monthzh 月 \@day 日%
-承下列考試委員審查通過及口試及格,特此證明\par
-  \end{singlespace}
-  \vspace{\fill}
-  \begin{center}
-  \begin{doublespace}
-  \fontsize{15}{30}\selectfont
-  \begin{tabular}{p{2.75cm}p{12.5cm}}
-    \raisebox{30pt}{口試委員:} & \rule{11.5cm}{1pt} \\
-    & \rule{5cm}{1pt}\hspace{1.5cm}\rule{5cm}{1pt} \\
-    & \rule{5cm}{1pt}\hspace{1.5cm}\rule{5cm}{1pt} \\
-    & \rule{5cm}{1pt}\hspace{1.5cm}\rule{5cm}{1pt} \\
-    & \rule{5cm}{1pt}\hspace{1.5cm}\rule{5cm}{1pt} \\
-    \raisebox{5pt}{所\hspace{15pt}長:} & \rule{8.5cm}{1pt}
-  \end{tabular}
-  \end{doublespace}
-  \end{center}
-  \vspace*{-1cm}
-}
+% \DeclareRobustCommand{\makecover}{
+%   \begin{titlepage}
+%     \vspace{1cm}
+%     \begin{singlespace}
+%     \begin{center}
+%       \fontsize{18}{27}\selectfont
+%       \@universityzh\@collegezh\@institutezh\par
+%         \@typezh{}\@classzh\par
+%       {\fontsize{14}{21}\selectfont
+%         \@instituteen\par
+%         \@collegeen\par}
+%       {\fontsize{16}{24}\selectfont
+%         \@universityen\par
+%         \@typeen{} \@classen\par}
+%       \vspace{\fill}
+%       \@titlezh\par
+%       \@titleen\par
+%       \vspace{\fill}
+%       \@authorzh\\
+%       \@authoren\par
+%       \vspace{2cm}
+%       指導教授:\@advisorzh\\
+%       Advisor: \@advisoren\par
+%       \vspace{1.5cm}
+%       中華民國 \@yearzh 年 \@monthzh 月\\
+%       \@monthen, \@yearen
+%     \end{center}
+%     \end{singlespace}
+%     \vspace{1cm}
+%   \end{titlepage}
+% }
+
+
+% \DeclareRobustCommand{\makecertification}{
+%   \clearpages
+%   \begin{singlespace}
+%   \begin{center}
+%     \fontsize{24}{36}\selectfont\@universityzh\@typezh{}學位\@classzh\\
+%     口試委員會審定書\par
+%     \vspace{0.5cm}
+%     {\fontsize{20}{30}\selectfont\@titlezh\par\@titleen\par}
+%   \end{center}
+%   \addcontentsline{toc}{chapter}{口試委員會審定書}
+%   \vspace{1cm}
+%   \fontsize{15}{24}\selectfont
+% \hspace{30pt}本論文係\@authorzh{}君 (\@studentid)
+% 在\@universityzh\@institutezh{}完成之\@typezh{}學位\@classzh,%
+% 於民國 \@yearzh 年 \@monthzh 月 \@day 日%
+% 承下列考試委員審查通過及口試及格,特此證明\par
+%   \end{singlespace}
+%   \vspace{\fill}
+%   \begin{center}
+%   \begin{doublespace}
+%   \fontsize{15}{30}\selectfont
+%   \begin{tabular}{p{2.75cm}p{12.5cm}}
+%     \raisebox{30pt}{口試委員:} & \rule{11.5cm}{1pt} \\
+%     & \rule{5cm}{1pt}\hspace{1.5cm}\rule{5cm}{1pt} \\
+%     & \rule{5cm}{1pt}\hspace{1.5cm}\rule{5cm}{1pt} \\
+%     & \rule{5cm}{1pt}\hspace{1.5cm}\rule{5cm}{1pt} \\
+%     & \rule{5cm}{1pt}\hspace{1.5cm}\rule{5cm}{1pt} \\
+%     \raisebox{5pt}{所\hspace{15pt}長:} & \rule{8.5cm}{1pt}
+%   \end{tabular}
+%   \end{doublespace}
+%   \end{center}
+%   \vspace*{-1cm}
+% }
 
 \newenvironment{quotationpage}[1]
   {\clearpages
diff --git a/nctuvars.tex b/nctuvars.tex
new file mode 100644
index 0000000..d0b102a
--- /dev/null
+++ b/nctuvars.tex
@@ -0,0 +1,22 @@
+% author Po-Hao Huang [https://github.com/Po-haoHuang]
+
+% ----------------------------------------------------------------------------
+% "THE CHOCOLATE-WARE LICENSE":
+% Tz-Huan Huang wrote this file. As long as you retain this notice you
+% can do whatever you want with this stuff. If we meet some day, and you think
+% this stuff is worth it, you can buy me a chocolate in return Tz-Huan Huang
+% ----------------------------------------------------------------------------
+
+% Syntax: \var{English}{Chinese}
+
+
+% \university{National Chiao Tung University}{國立交通大學}
+% \college{College of Computer Science}{資訊學院}
+% \institute{Institute of Computer Science and Engineering}{資訊科學與工程研究所}
+% \title{Test}{測試}
+% \author{AAA}{王曉明}
+% \studentid{0000000}
+% \advisor{AAA, Ph.D.}{王大明\ 博士}
+% \defenseyear{2016}{105}
+% \defensemonth{July}{7}
+% \defenseday{1}
diff --git a/ntuvars.tex b/ntuvars.tex
deleted file mode 100644
index 2c91d6d..0000000
--- a/ntuvars.tex
+++ /dev/null
@@ -1,20 +0,0 @@
-% author: Tz-Huan Huang [http://www.csie.ntu.edu.tw/~tzhuan]
-
-% ----------------------------------------------------------------------------
-% "THE CHOCOLATE-WARE LICENSE":
-% Tz-Huan Huang wrote this file. As long as you retain this notice you
-% can do whatever you want with this stuff. If we meet some day, and you think
-% this stuff is worth it, you can buy me a chocolate in return Tz-Huan Huang
-% ----------------------------------------------------------------------------
-
-% Syntax: \var{English}{Chinese}
-\university{National Taiwan University}{國立臺灣大學}
-\college{College of Electrical Engineering and Computer Science}{電機資訊學院}
-\institute{Department of Computer Science and Information Engineering}{資訊工程學系}
-\title{Master's Thesis in Computer Science}{資訊系中碩士生學位論文之研究}
-\author{Siao-Ming Wang}{王小明}
-\studentid{R00000000}
-\advisor{Da-Ming Wang, Ph.D.}{王大明\ 博士}
-\defenseyear{2015}{104}
-\defensemonth{July}{7}
-\defenseday{31}
diff --git a/pdfs/cert.pdf b/pdfs/cert.pdf
deleted file mode 100644
index 2eb6ad3..0000000
Binary files a/pdfs/cert.pdf and /dev/null differ
diff --git a/pdfs/ch.pdf b/pdfs/ch.pdf
new file mode 100644
index 0000000..6ef8efa
Binary files /dev/null and b/pdfs/ch.pdf differ
diff --git a/pdfs/copyright.pdf b/pdfs/copyright.pdf
new file mode 100644
index 0000000..df9410f
Binary files /dev/null and b/pdfs/copyright.pdf differ
diff --git a/pdfs/cover.pdf b/pdfs/cover.pdf
new file mode 100644
index 0000000..60af2a6
Binary files /dev/null and b/pdfs/cover.pdf differ
diff --git a/pdfs/en.pdf b/pdfs/en.pdf
new file mode 100644
index 0000000..554e97b
Binary files /dev/null and b/pdfs/en.pdf differ
diff --git a/pdfs/first_page.pdf b/pdfs/first_page.pdf
new file mode 100644
index 0000000..f771bc8
Binary files /dev/null and b/pdfs/first_page.pdf differ
diff --git a/src/cert.docx b/src/cert.docx
deleted file mode 100644
index 4468c09..0000000
Binary files a/src/cert.docx and /dev/null differ
diff --git a/src/spine.docx b/src/spine.docx
deleted file mode 100644
index bc8fc28..0000000
Binary files a/src/spine.docx and /dev/null differ
diff --git a/src/with-watermark.tex b/src/with-watermark.tex
index e2a80c9..737e195 100644
--- a/src/with-watermark.tex
+++ b/src/with-watermark.tex
@@ -1,4 +1,4 @@
-% 臺大論文浮水印
-\CenterWallPaper{0.174}{pdfs/watermark.pdf}
-\setlength{\wpXoffset}{6.1725cm}
-\setlength{\wpYoffset}{10.5225cm}
+% 論文浮水印
+\CenterWallPaper{1}{pdfs/watermark.pdf}
+\setlength{\wpXoffset}{0 cm}
+\setlength{\wpYoffset}{0 cm}
diff --git a/src/without-watermark.tex b/src/without-watermark.tex
index 84e45df..300361b 100644
--- a/src/without-watermark.tex
+++ b/src/without-watermark.tex
@@ -1,2 +1,2 @@
-% 臺大論文浮水印
+% 論文浮水印
 % Do nothing.
diff --git a/tables/4-0.tex b/tables/4-0.tex
new file mode 100644
index 0000000..478d210
--- /dev/null
+++ b/tables/4-0.tex
@@ -0,0 +1,18 @@
+\begin{table}[htbp]
+\centering
+\caption{受測者描述性統計}
+\label{4-0}
+\begin{adjustbox}{max width=0.92\textwidth}
+\begin{tabular}{llrrrrr}
+
+\toprule
+\multicolumn{2}{l}{\textbf{變數}} & \textbf{個數} & \textbf{最小值} & \textbf{最大值} & \textbf{平均數} & \textbf{標準差} \\ \midrule
+\multicolumn{1}{l}{\textbf{背景}} & \textbf{} & \textbf{} & \textbf{} & \textbf{} & \textbf{} & \textbf{} \\
+
+\multicolumn{1}{l}{\textbf{資料}} & \textbf{} & \textbf{} & \textbf{} & \textbf{} & \textbf{} & \textbf{} \\
+
+\multicolumn{1}{l}{\textbf{資料}} & \textbf{} & \textbf{} & \textbf{} & \textbf{} & \textbf{} & \textbf{} \\
+\bottomrule
+\end{tabular}
+\end{adjustbox}
+\end{table}
\ No newline at end of file
diff --git a/tables/4-4.tex b/tables/4-4.tex
new file mode 100644
index 0000000..3829cfd
--- /dev/null
+++ b/tables/4-4.tex
@@ -0,0 +1,15 @@
+\begin{table}[htbp]
+\centering
+\caption{測試(N=50)}
+\label{4-4}
+\begin{adjustbox}{max width=\textwidth}
+\begin{tabular}{@{}ccccclrc@{}}
+\toprule
+ & \multicolumn{2}{c}{測試一} & \multicolumn{2}{c}{測試二} &  &  &  \\ \cmidrule(lr){2-5}
+ & 平均 & 標準差 & 平均 & 標準差 & 自由度 & t值 & \textit{p-value} \\ \midrule
+Q1 & 3.58 & 1.64 & 3.23 & 1.84 & 48 & -.71 & .47 \\
+Q2 & 3.71 & 1.48 & 4.04 & 1.42 & 48 & .80 & .42 \\
+Q3 & 5.46 & 2.22 & 6.15 & 1.51 & 40.126 & 1.28 & .20 \\ \bottomrule
+\end{tabular}
+\end{adjustbox}
+\end{table}
\ No newline at end of file
diff --git a/tables/4-9.tex b/tables/4-9.tex
new file mode 100644
index 0000000..e5b40f7
--- /dev/null
+++ b/tables/4-9.tex
@@ -0,0 +1,25 @@
+\begin{sidewaystable}
+
+\centering
+\caption{測試anova(N=50)}
+\label{4-9}
+\begin{adjustbox}{max width=\textwidth}
+\begin{tabular}{@{}crrrrr@{}}
+
+\toprule
+\multicolumn{1}{l}{} & \multicolumn{1}{c}{\begin{tabular}[c]{@{}c@{}}G1\\ 測試\\ N=12\\ (M/SD)\end{tabular}} & \multicolumn{1}{c}{\begin{tabular}[c]{@{}c@{}}G2\\ 測試\\ N=12\\ (M/SD)\end{tabular}} & \multicolumn{1}{c}{\begin{tabular}[c]{@{}c@{}}G3\\ 測試\\ N=14\\ (M/SD)\end{tabular}} & \multicolumn{1}{c}{\begin{tabular}[c]{@{}c@{}}G4\\ 測試\\ N=12\\ (M/SD)\end{tabular}} & \multicolumn{1}{c}{\begin{tabular}[c]{@{}c@{}}F\\ (df)\end{tabular}} \\
+\midrule
+\multicolumn{1}{l}{變數名稱} & \multicolumn{1}{c}{} & \multicolumn{1}{c}{} & \multicolumn{1}{c}{} & \multicolumn{1}{c}{} & \multicolumn{1}{c}{} \\
+測試 & (7.25/1.76) & (6.00/1.80) & (6.43/1.91) & (6.42/1.73) & \begin{tabular}[c]{@{}r@{}}1.00\\ (3,46)\end{tabular} \\
+測試 & (40.16/12.01) & (40.08/11.13) & (34.35/10.93) & (36.33/7.66) & \begin{tabular}[c]{@{}r@{}}.95\\ (3,46)\end{tabular} \\
+測試 & (68.83/14.04) & (68.83/23.37) & (79.21/22.73) & (81.75/30.13) & \begin{tabular}[c]{@{}r@{}}1.05\\ (3,46)\end{tabular} \\
+測試 & (39.25/74.65) & (10.66/91.36) & (30.71/38.42) & (18.00/90.86) & \begin{tabular}[c]{@{}r@{}}.19\\ (3,46)\end{tabular} \\
+測試 & (1.37/.42) & 高(1.58/.82) & (1.11/.62) & 低(.80/.63) & \begin{tabular}[c]{@{}r@{}}3.33*\\ (3,46)\end{tabular} \\
+測試 & (04.66/12.66) & (39.83/11.26) & (71.92/29.64) & (39.50/19.43) & \begin{tabular}[c]{@{}r@{}}.71\\ (3,46)\end{tabular} \\
+測試 & (4.84/1.21) & (5.14/1.41) & (4.59/1.12) & (4.78/1.45) & \begin{tabular}[c]{@{}r@{}}.40\\ (3,46)\end{tabular} \\
+測試 & (10.45/34.43) & (05.12/41.36) & (87.46/34.60) & (95.20/30.74) & \begin{tabular}[c]{@{}r@{}}1.08\\ (3,46)\end{tabular} \\
+\bottomrule
+\end{tabular}
+\end{adjustbox}
+
+\end{sidewaystable}
\ No newline at end of file
diff --git a/tables/group.tex b/tables/group.tex
new file mode 100644
index 0000000..4dc85e7
--- /dev/null
+++ b/tables/group.tex
@@ -0,0 +1,17 @@
+\begin{table}[!htbp]
+\centering
+\caption{實驗分組}
+\label{t:group}
+\begin{adjustbox}{max width=\textwidth}
+\begin{tabular}{@{}ccc@{}}
+\toprule
+\textbf{\begin{tabular}[c]{@{}c@{}}第一部分題目\\ Q1 Q2 Q3\end{tabular}} & \textbf{\begin{tabular}[c]{@{}c@{}}第二部分題目\\ Q4\end{tabular}} & \textbf{組別} \\ \midrule
+abc & abc & 4 \\
+abc & abc & 2 \\
+abc & abc & 3 \\
+abc & abc & 1 \\ \bottomrule
+\end{tabular}
+\end{adjustbox}
+\newline
+\small{資料來源:本研究}
+\end{table}
\ No newline at end of file
diff --git a/tables/results.tex b/tables/results.tex
deleted file mode 100644
index b72d955..0000000
--- a/tables/results.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\begin{table}[!htbp]
-\centering
-\begin{tabular}{|c|c|c|c|}
-\hline
-
-Method      &    Precision &     Recall &     F1-Score \\ \hline
-their model &     3.40     &      3.40  &      3.40    \\ \hline
-our model   &    99.99     &     99.99  &     99.99    \\ \hline
-
-
-\end{tabular}
-\caption{Final performance of our system. }
-\label{t:results} 
-\end{table}
diff --git a/thesis.bib b/thesis.bib
index 317f359..8334904 100644
--- a/thesis.bib
+++ b/thesis.bib
@@ -1,8 +1,6 @@
-@article{o2014cats,
-    title={Do cats know they rule {Y}ouTube? {S}urveillance and the pleasures of cat videos},
-    author={O'Meara, Radha},
-    journal={M/C Journal},
-    volume={17},
-    number={2},
-    year={2014}
+@article{test1999,
+  title={Test.},
+  author={AAA, BBB, CCC},
+  year={1999},
+  publisher={DDD}
 }
diff --git a/thesis.tex b/thesis.tex
index ac06166..08f7732 100644
--- a/thesis.tex
+++ b/thesis.tex
@@ -1,72 +1,109 @@
-\documentclass[oneside]{ntuthesis}
-
+\documentclass[oneside,zh]{nctuthesis}
+\usepackage{enumitem}
 \usepackage{times}
 \usepackage{verbatim}
 \usepackage{color}
 \usepackage{url}
 \usepackage{graphicx}
 \usepackage{array}
-\usepackage{pdfpages} % include outside .pdf
+\usepackage{pdfpages} % include inserted .pdf to page no.
 \usepackage{wallpaper} % watermark
 
 % Format the refs
-\usepackage[sort,comma]{natbib}
+\usepackage[sort]{natbib}
 \usepackage[hidelinks]{hyperref}
 
+% For Cross ref
+\usepackage{xr}
+
+
 % For the tree
 \usepackage{tikz}
 \usepackage{tikz-qtree}
 
+% For code display
+\usepackage{listings}
+
+% For the APA table
+\usepackage{adjustbox}
+\usepackage{multirow,booktabs,setspace,caption}
+\usepackage{rotating}
+\usepackage{dcolumn}
+\newcolumntype{z}{D{.}{.}{3}} % for decimal dot alignment
+
+% For hyperlink
+\usepackage{hyperref}
+
 % For barchart
 \usepackage{pgfplots}
+\pgfplotsset{compat=1.12}
+
+% For setting counters of figure and table
+\usepackage{chngcntr}
 
 % Using the tex-text mapping for ligatures etc.
 \defaultfontfeatures{Mapping=tex-text}
 
 % Set the default fonts
 \setmainfont{Times New Roman}
-\setCJKmainfont{標楷體}
+\setCJKmainfont{TW-Kai} %modify for overleaf service
 
 % Your information goes here
-\input{ntuvars}
+\input{nctuvars}
 
 \begin{document}
 
-% 臺大論文浮水印
-\input{watermark.tex}
+% 論文浮水印 如需浮水印時取消此行註解
+% \input{src/with-watermark.tex}
 
 \hypersetup{pageanchor=false}
 
 \frontmatter
 \pagenumbering{gobble}
-\makecover
 
+% 此處不自動產生交大封面改採插入pdf封面故註解
+% \makecover
+
+%以插入pdf檔方式加入封面及書名頁
+\includepdf[pages={1}]{pdfs/cover.pdf}
+\includepdf[pages={1}]{pdfs/first_page.pdf}
+
+% 開始編羅馬數字頁碼
 \clearpages
 \setcounter{page}{1}
 \hypersetup{pageanchor=true}
 \pagenumbering{roman}
 \phantomsection
 
-% generate certification
-% \makecertification
-% or include scanned pdf
-\addcontentsline{toc}{chapter}{口試委員會審定書}
-\includepdf[pages={1}]{pdfs/cert.pdf}
+%插入論文審定書 著作權審定書等等
+\addcontentsline{toc}{chapter}{中文論文口試委員會審定書}
+\includepdf[pages={1}, pagecommand={}]{pdfs/ch.pdf}
+\addcontentsline{toc}{chapter}{Thesis Certificate}
+\includepdf[pages={1}, pagecommand={}]{pdfs/en.pdf}
+\addcontentsline{toc}{chapter}{論文著作權授權書}
+\includepdf[pages={1}, pagecommand={}]{pdfs/copyright.pdf}
 
-\input{acknowledgements}
+% 摘要 致謝
 \input{abstract}
+\input{acknowledgements}
+
 
-% Table of Content
+% % Table of Content
 \clearpages
 \tableofcontents
-% List of Figures
+
+% % List of Figures
 \clearpages
 \listoffigures
-% List of Tables
+
+% % List of Tables
 \clearpages
 \listoftables
 
 \mainmatter
+% % tables and figures counter without chapter
+\counterwithout{table}{chapter}
+\counterwithout{figure}{chapter}
 
 % Your thesis goes here
 \input{chapters/introduction}
@@ -75,9 +112,7 @@
 \input{chapters/experiment}
 \input{chapters/conclusion}
 
-\@startappendix
 
-\input{chapters/dataset}
 
 \backmatter
 
@@ -88,5 +123,8 @@
 
 % Your bibliography goes here
 \bibliography{thesis}
+\@startappendix
 
+% 交大圖書館規定附錄在參考文獻之後
+\input{chapters/otherbib}
 \end{document}