diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
index 09da2b8..ef14aad
--- a/.gitignore
+++ b/.gitignore
@@ -138,5 +138,10 @@ dmypy.json
 # pytype static type analyzer
 .pytype/
 
+*.pyc
+
+# jetbrains pycharm
+.idea/
+
 # End of https://www.toptal.com/developers/gitignore/api/python
 n
\ No newline at end of file
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
index 53a1665..bf2cf19
--- a/README.md
+++ b/README.md
@@ -1,64 +1,267 @@
 # oj-cli
 ## Installation 
-### Ghost Server
+### Installation in NCCU GHOST
+
 ```
-cd ~
-echo 'export PATH="~f103207425/.local/bin:$PATH"' >> ~/.profile
-source ~/.bashrc
+echo 'alias oj="python2.7 ~s10940/oj-cli/oj.py"' >> ~/.profile
+source ~/.profile
 ```
 
-### Install from Source Code
-1. Clone this project
+### Installation from source code
+
 ```
-git clone https://github.com/josix/oj-cli.git
+git clone https://github.com/andyjjrt/oj-cli.git
+cd oj-cli
+echo "alias oj='python2.7 $PWD/oj'" >> ~/.bashrc
+source ~/.bashrc
 ```
 
-2. Update `HOST` variable value in file `oj-cli/constants.py` to the OnlineJudge URL you accessing
-3. Update Shebang(`#!/opt/csw/bin/python2.7`) value to a suitable one in `oj.py`
+If your shell is different like `ash`, you may need to change `.bashrc` to `.profile`.
+After installation, please modify `CONTEST_NAME` variable in `constants.py` to the target contest name.
+
 
 ### Commands
-### `oj login`
-### About
+### oj login
+#### About
 Use `oj login` to login to the account in OnlineJudge. It required you to enter your account information so that `oj-cli` could access OnlineJudge service successfully. After entering your username and password. `oj-cli` will respond if you login successfully or not.
-### Usage
+#### Usage
 No argument required. Only enter `oj login` and fill the account information to login to OnlineJudge.
-### Example
+#### Example
 ```
 $ oj login
 Usernme:
 Password:
 ```
 
-### `oj get_assign <assign_no>`
-### About
-Use `oj get_assign <assign_no>` to download the latest assignment from contest. The downloaded files are stored in folder `hwX` or `exX`. The folder includes testing data, output data, and template C script, which are named as `1.in`, `1.out`, and `hwX.c`(or `exX.c`) separately.
-### Usage
-`oj get_assign` only required one argument to execute.
-#### assign_no
-assign_no represents your assign number like `hw1`, `ex1`, etc. `oj-cli` will prompt `Invalid Assign Number!` if the input assign number has not opened.
+### oj get <assign_no>
+#### About
+Use `oj get <assign_no>` to download the latest assignment from contest. The downloaded files are stored in folder `hwX`. The folder includes testing data, output data, and template C script, which are named as `1.in`, `1.out`, and `main.c` separately.
+#### Usage
+`oj get` only required one argument to execute.
+##### assign_no
+assign_no represents your assign number like `hw1`, `hw2` according to your updates. `oj-cli` will prompt `Invalid Assign Number!` if the input assign number has not opened and give valid assign numbers.
 
-### Example
+#### Example
 ```
-$ oj get_assign hw2
-$ oj get_assign ex3
+$ oj get hw1
+Made a [hw1] folder in your current directory.
 ```
 
+### oj get_p <problem_no>
+#### About
+Use `oj get_p <problem_no>` to download the problem in problem list. The downloaded files are stored in folder `problem_X`. The folder includes testing data, output data, and template C script, which are named as `1.in`, `1.out`, and `main.c` separately.
+#### Usage
+`oj get_p` only required one argument to execute.
+##### problem_no
+problem_no represents your problem display id like `1`, `57-2` according to your updates. `oj-cli` will prompt `Invalid Problem Id!` if the input problem id is invalid.
+##### Notice
+problem_no somtimes has blanks, cli will automatically replace them.
+#### Example
+```
+$ oj get_p 57-2
+Made a [problem_57-2] folder in your current directory.
+```
 
-### `oj submit <assign_no> <code_file>`
-### About
-Use `oj submit <assign_no> <code_file>` to submit your code to contest. 
+### oj submit <assign_no> <code_file>
+#### About
+Use `oj submit <assign_no> <code_file>` to submit your code to contest and return the results. 
 
-### Usage
-`oj get_assign` required two arguments to execute.
+#### Usage
+`oj submit` required two arguments to execute.
 
-#### assign_no
-assign_no represents your assign number like `hw1`, `ex1`, etc. `oj-cli` will prompt `Invalid Assign Number!` if the input assign number has not opened.
+##### assign_no
+assign_no represents your assign number like `hw1`, `hw2` according to your updates. `oj-cli` will prompt `Invalid Assign Number!` if the input assign number has not opened and give valid assign numbers. 
 
-#### code_file
+##### code_file
 code_file is the path to your script. `oj` will read the file then submit this answer to OnlineJudge Service.
 
 #### Example
 ```
 $ oj submit hw2 hw2.c
-$ oj submit ex3 ../ex3.c
+Submit successfully!
+Getting submission status...
+=================================================
+Result: AC(Accept)              Score: 100
+|ID |Status                |   Time|  Mem| Score|
+|#1 |AC(Accept)            |    0ms|  2MB|    20|
+|#2 |AC(Accept)            |    2ms|  2MB|    20|
+|#3 |AC(Accept)            |   40ms|  2MB|    20|
+|#4 |AC(Accept)            |   75ms|  2MB|    20|
+|#5 |AC(Accept)            |    5ms|  2MB|    20| 
+================================================= 
+```
+
+
+### oj submit_p <problem_no> <code_file>
+#### About
+Use `oj submit_p <problem_no> <code_file>` to submit your code to problem and return the results. 
+
+#### Usage
+`oj submit_p` required three arguments to execute.
+
+##### problem_no
+assign_no represents your assign number like `1`, `2` according to your updates. `oj-cli` will prompt `Invalid Assign Number!` if the input assign number soes not exist. 
+
+Notice that blanks in `problem_no` will be replaced by nothing.
+
+##### code_file
+code_file is the path to your script. `oj` will read the file then submit this answer to OnlineJudge Service.
+
+#### Example
+```
+$ oj problem_submit 1091CP1_Exercise8 ex8.c
+Submit successfully!!
+Getting submission status...
+========================================================
+Result: AC(Accept)                     Score: 100
+|ID |Status                       |   Time|  Mem| Score|
+|#1 |AC(Accept)                   |    1ms|  2MB|    20|
+|#2 |AC(Accept)                   |    1ms|  2MB|    20|
+|#3 |AC(Accept)                   |    1ms|  2MB|    20|
+|#4 |AC(Accept)                   |    2ms|  2MB|    20|
+|#5 |AC(Accept)                   |    1ms|  2MB|    20|
+========================================================
+
+```
+
+
+### oj rank <assign_no>
+#### About
+Use `oj rank <assign_no>` to view the class result of this assign.
+#### Usage
+`oj rank` only required one argument to execute.
+#### assign_no
+assign_no represents your assign number like `hw1`, `hw2` according to your updates. `oj-cli` will prompt `Invalid Assign Number!` if the input assign number has not opened and give valid assign numbers. 
+
+#### Example
+```
+$ oj rank hw2
+Your status of hw2 : AC(Accept)
+================================================
+   1~ 10 :  0  |  AC(Accept)             : 8
+  11~ 20 :  0  |  RE(Runtime Error)      : 29
+  21~ 30 :  0  |  PAC(Partial Accepted)  : 54
+  31~ 40 :  1  |  WA(Wrong Answer)       : 81
+  41~ 50 :  0  |  CE(Compilation Error)  : 10
+  51~ 60 :  0  |--------------------------------
+  61~ 70 :  0  |  Total submissions      : 182
+  71~ 80 :  0  |
+  81~ 90 :  0  |
+  91~100 : 12  |
+================================================
+For real score ranking,please go to the website. 
 ```
+
+
+### oj update
+#### About
+Use `oj update` to get the latest assignments.
+#### Usage
+No argument required. Only enter `oj update` and it will automatically get the assignments.
+
+#### Example
+```
+$ oj update
+Target Contest: 1101CP1
+Found HomeWork: hw0 [Online Submission]
+```
+
+### oj update_p
+#### About
+Use `oj update_p` to get the latest assignments.
+#### Usage
+No argument required. Only enter `oj update_p` and it will automatically get the problems.
+
+#### Example
+```
+$ oj update_p
+Updated problems successfully!
+```
+
+
+### oj status <assign_no>
+#### About
+Use `oj status <assign_no>` to view the latest 20 submissions of this contest.
+#### Usage
+`oj status` only required one argument to execute.
+##### assign_no
+assign_no represents your assign number like `hw1`, `hw2` according to your updates. `oj-cli` will prompt `Invalid Assign Number!` if the input assign number has not opened and give valid assign numbers. 
+
+#### Example
+```
+$ oj status hw2
+============================================================================
+|  Contest Name: hw2                                             |
+============================================================================
+|User        |Status                     |   Time|  Mem|               When|
+|108xxxxxx   |WA(Wrong Answer)           |    0ms|  2MB|2020-12-18 10:31:12|
+|109xxxxxx   |AC(Accept)                 |    0ms|  2MB|2020-12-18 10:07:14|
+|109xxxxxx   |PAC(Partial Accepted)      |    0ms|  2MB|2020-12-18 09:20:10|
+|109xxxxxx   |PAC(Partial Accepted)      |   21ms|  2MB|2020-12-18 09:20:02|
+|109xxxxxx   |PAC(Partial Accepted)      |   17ms|  2MB|2020-12-18 09:07:19|
+|109xxxxxx   |PAC(Partial Accepted)      |    1ms|  4MB|2020-12-18 08:50:13|
+============================================================================
+...
+```
+
+### oj mystat <option>
+#### About
+Use `oj mystat <option>` to view your latest 20 submissions of this contest, each of the submission has the specific ID.
+#### Usage
+`oj mystat` only required one argument to execute.
+##### option
+Here we have two options:
+1. assign_no represents your assign number like `hw1`, `hw2` according to your updates. `oj-cli` will prompt `Invalid Assign Number!` if the input assign number has not opened and give valid assign numbers.  
+2. IDx is the specific ID that `oj mystat <hwx>` gives you, here you can see details of this submition.
+#### Note
+The ID will only update if you type `oj mystat <hwx>`
+
+#### Example
+```
+$ oj mystat hw1
+====================================================================
+|  Contest Name: hw1                                     |
+====================================================================
+|ID  |Status                     |   Time|  Mem|               When|
+|ID 0|AC(Accept)                 |    0ms|  2MB|2020-12-17 10:39:13|
+====================================================================
+
+$ oj mystat ID4
+=================================================
+Result: PAC(Partial Accepted)   Score:  20
+|ID |Status                |   Time|  Mem| Score|
+|#1 |AC(Accept)            |    1ms|  2MB|    20|
+|#2 |WA(Wrong Answer)      |    2ms|  2MB|     0|
+|#3 |WA(Wrong Answer)      |   28ms|  2MB|     0|
+|#4 |WA(Wrong Answer)      |   48ms|  2MB|     0|
+|#5 |WA(Wrong Answer)      |    5ms|  2MB|     0|
+================================================= 
+```
+
+### oj dl <ID>
+#### About
+Use `oj dl <ID>` to download your specific submission's source code.
+#### Usage
+`oj dl` only required one argument to execute.
+#### option
+ID is the specific ID that `oj mystat <hwx>` gives you, here you can see details of this submition.
+#### Note
+The ID will only update if you type `oj mystat <hwx>`
+
+#### Example
+```
+$ oj dl ID0
+=================================================
+Result: AC(Accept)              Score: 100
+|ID |Status                |   Time|  Mem| Score|
+|#1 |AC(Accept)            |    0ms|  2MB|    20|
+|#2 |AC(Accept)            |    2ms|  2MB|    20|
+|#3 |AC(Accept)            |   40ms|  2MB|    20|
+|#4 |AC(Accept)            |   75ms|  2MB|    20|
+|#5 |AC(Accept)            |    5ms|  2MB|    20|
+=================================================
+Downloaded your file!!!
+File name:1097030xx|xxxxxxxxxxxxxxxxxxxxxxx.c in yor current directory. 
+```
+
+
diff --git a/assign_mapping.json b/assign_mapping.json
deleted file mode 100644
index 29efbaf..0000000
--- a/assign_mapping.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "hw0": {
-    "contest_id": 6,
-    "contest_problem_id": "1091CP1+Assign0",
-    "problem_id": 124
-  },
-  "hw1": {
-    "contest_id": 7,
-    "contest_problem_id": "1091CP1+Assign1",
-    "problem_id": 132
-  },
-  "ex1": {
-    "contest_id": 8,
-    "contest_problem_id": "1091CP1+Exercise+1",
-    "problem_id": 134
-  },
-  "hw2": {
-    "contest_id": 9,
-    "contest_problem_id": "1091CP1+Assign2",
-    "problem_id": 143
-  },
-  "hw3": {
-    "contest_id": 13,
-    "contest_problem_id": "1091CP1+Assign3",
-    "problem_id": 153
-  },
-  "ex3": {
-    "contest_id": 14,
-    "contest_problem_id": "1091CP1+Exercise3",
-    "problem_id": 154
-   },
-  "hw5": {
-    "contest_id": 25,
-    "contest_problem_id": "1091CP1+Assign5",
-    "problem_id": 169
-  },
-  "ex5": {
-    "contest_id": 28,
-    "contest_problem_id": "1091CP1+Exercise5",
-    "problem_id": 172
-  },
-  "hw6": {
-    "contest_id": 29,
-    "contest_problem_id": "1091CP1+Assign6",
-    "problem_id": 176
-  },
-  "ex6": {
-    "contest_id": 30,
-    "contest_problem_id": "1091CP1+Exercise6",
-    "problem_id": 178
-  },
-  "hw7": {
-    "contest_id": 36,
-    "contest_problem_id": "1091CP1+Assign7",
-    "problem_id": 186
-  },
-  "ex7": {
-    "contest_id": 38,
-    "contest_problem_id": "1091CP1+Exercise7",
-    "problem_id": 190
-  },
-  "hw8": {
-    "contest_id": 40,
-    "contest_problem_id": "1091CP1+Assign8",
-    "problem_id": 192
-  },
-  "ex8": {
-    "contest_id": 41,
-    "contest_problem_id": "1091CP1+Exercise8",
-    "problem_id": 195
-  }
-}
diff --git a/commands/__init__.py b/commands/__init__.py
old mode 100644
new mode 100755
index c4a42c8..e672d88
--- a/commands/__init__.py
+++ b/commands/__init__.py
@@ -3,5 +3,10 @@
 from .login import auth
 from .status import status
 from .submit import submit
-
-__all__ = ["auth", "get_assign", "submit", "get_problem", "status"]
+from .update_contest import update_contest_map
+from .update_problem import update_problem_map
+from .contest import contests_result, contests_status, my_contests_status
+from .download import dl
+from .problem import problem_submit
+from .grade import get_grades
+__all__ = ["auth", "get_assign", "submit", "get_problem", "status","update_contest_map","update_problem_map","contests_result", "contests_status", "my_contests_status", "dl", "problem_submit", "get_grades"]
diff --git a/commands/contest.py b/commands/contest.py
new file mode 100755
index 0000000..31eb28d
--- /dev/null
+++ b/commands/contest.py
@@ -0,0 +1,248 @@
+import json
+import os
+from datetime import datetime
+from datetime import timedelta
+
+from constants import ASSIGNMENT_MAPPING_PATH, COOKIES_DIR, MY_STATUS_PATH, STATEMENT_PATH
+from .status import status
+from util.common import get_csrf_token
+from util.curl import curl
+from util.colors import cyan_wrapper, green_wrapper, purple_wrapper, red_wrapper
+
+
+def contests_status(assign_name):
+	with open(ASSIGNMENT_MAPPING_PATH, "rt") as json_in:
+		assign_to_config = json.load(json_in)
+	if assign_name not in assign_to_config:
+		print("Invalid Assign Number!")
+		print("Available names are:")
+		for hwmap in assign_to_config:
+			print("- " + cyan_wrapper(hwmap + " [" + assign_to_config[hwmap]['contest_name'] + "]"))
+		print("If you want to update latest homework assignment, type: [oj update] to update.")
+		return
+	contest_id, problem_id = (
+        assign_to_config[assign_name]["contest_id"],
+        assign_to_config[assign_name]["contest_problem_id"],
+    )
+	endpoint = "contest_submissions?myself=0&contest_id={}&limit=20&problem_id={}".format(
+        contest_id,
+		assign_name
+    )
+	result = json.loads(curl("get", endpoint=endpoint, use_x_csrf_token=True))
+	if result["error"] == "error":
+		print("Error : " + result["data"])
+		return
+	result = result["data"]["results"]
+	status_to_response = {
+			-1: red_wrapper("WA(Wrong Answer)"),  # WA
+			-2: cyan_wrapper("CE(Compilation Error)"),  # CE
+			0: green_wrapper("AC(Accept)"),  # AC
+			1: purple_wrapper("TLE(Time Limit Exceeded)"),  # TLE
+			2: purple_wrapper("TLE(Time Limit Exceeded)"),  # TLE
+			3: purple_wrapper("MLE(Memory Limit Exceeded)"),  # ML 
+			4: purple_wrapper("RE(Runtime Error)"),  # RE
+			8: cyan_wrapper("PAC(Partial Accepted)")
+			}
+	print("============================================================================")
+	print('|  Problem Name: {:58}|'.format(assign_to_config[assign_name]["contest_problem_id"] + " [" + assign_to_config[assign_name]["contest_name"] + "]"))
+	print("============================================================================")
+	print('|{:12}|{:27}|   Time|  Mem|               When|'.format("User","Status"))
+	for i in result:
+		if i["problem"] != assign_to_config[assign_name]["contest_problem_id"]:
+			continue
+		timestr = i["create_time"].split("T")[0]
+		timestr += " " + i["create_time"].split("T")[1].split(".")[0]
+		mydatetmp = datetime.strptime(timestr, '%Y-%m-%d %H:%M:%S')
+		hours_added = timedelta(hours = 8)
+		timestr = mydatetmp + hours_added
+		timestr.strftime("%m/%d/%Y, %H:%M:%S")
+		if i["result"] != -2:
+			try:
+				usrname = i["username"].encode('ascii').decode()
+			except UnicodeEncodeError:
+				usrname = "UCuser"
+			print('|{:12}|{:38}|{:5}ms|{:3}MB|{}|'.format(usrname, status_to_response[i["result"]], i["statistic_info"]["time_cost"], (i["statistic_info"]["memory_cost"]/1048576)+1, timestr))
+		else:
+			try:
+				usrname = i["username"].encode('ascii').decode()
+			except UnicodeEncodeError:
+				usrname = "UCuser"
+			print('|{:12}|{:38}|{:5}--|{:3}--|{}|'.format(usrname, status_to_response[i["result"]], "-----", "---", timestr))
+	print("============================================================================")
+
+def my_contests_status(assign_name):
+	with open(ASSIGNMENT_MAPPING_PATH, "rt") as json_in:
+		assign_to_config = json.load(json_in)
+	try:
+		with open(MY_STATUS_PATH, "rt") as json_in:
+			status_config = json.load(json_in)
+			if assign_name in status_config:
+				status(status_config[assign_name]["id"])
+				return
+	except:
+		pass
+	if assign_name not in assign_to_config:
+		print("Invalid Assign Number!")
+		print("Available names are:")
+		for hwmap in assign_to_config:
+			print("- " + cyan_wrapper(hwmap + " [" + assign_to_config[hwmap]['contest_name'] + "]"))
+		print("If you want to update latest homework assignment, type: [oj update] to update.")
+		return
+	contest_id, problem_id = (
+        assign_to_config[assign_name]["contest_id"],
+        assign_to_config[assign_name]["contest_problem_id"],
+    )
+	endpoint = "contest_submissions?myself=1&contest_id={}&limit=20&problem_id={}".format(
+        contest_id,
+		assign_name
+    )
+	result = json.loads(curl("get", endpoint=endpoint, use_x_csrf_token=True))
+	if result["error"] == "error":
+		print("Error : " + result["data"])
+		return
+	result = result["data"]["results"]
+	status_to_response = {
+			-1: red_wrapper("WA(Wrong Answer)"),  # WA
+			-2: cyan_wrapper("CE(Compilation Error)"),  # CE
+			0: green_wrapper("AC(Accept)"),  # AC
+			1: purple_wrapper("TLE(Time Limit Exceeded)"),  # TLE
+			2: purple_wrapper("TLE(Time Limit Exceeded)"),  # TLE
+			3: purple_wrapper("MLE(Memory Limit Exceeded)"),  # ML 
+			4: purple_wrapper("RE(Runtime Error)"),  # RE
+			8: cyan_wrapper("PAC(Partial Accepted)")
+			}
+	print("============================================================================")
+	print('|  Problem Name: {:58}|'.format(assign_to_config[assign_name]["contest_problem_id"] + " [" + assign_to_config[assign_name]["contest_name"] + "]"))
+	print("============================================================================")
+	print('|{:12}|{:27}|   {:4}|  {:3}|               When|'.format("ID  ","Status","Time","Mem"))
+	inputstr = '{'
+	idx = 0
+	for i in result:
+		if i["problem"] != assign_to_config[assign_name]["contest_problem_id"]:
+			continue
+		timestr = i["create_time"].split("T")[0]
+		timestr += " " + i["create_time"].split("T")[1].split(".")[0]
+		mydatetmp = datetime.strptime(timestr, '%Y-%m-%d %H:%M:%S')
+		hours_added = timedelta(hours = 8)
+		timestr = mydatetmp + hours_added
+		timestr.strftime("%m/%d/%Y, %H:%M:%S")
+		if i["result"] != -2:
+			print('|ID{:10}|{:38}|{:5}ms|{:3}MB|{}|'.format(idx,status_to_response[i["result"]], i["statistic_info"]["time_cost"], (i["statistic_info"]["memory_cost"]/1048576)+1, timestr))
+		else:
+			print('|ID{:10}|{:38}|{:5}--|{:3}--|{}|'.format(idx, status_to_response[i["result"]], "-----", "---", timestr))
+		if idx != 0:
+			inputstr += ','
+		inputstr += '"ID' + str(idx) + '":{"id":"' + i["id"] + '"}'
+		idx+=1
+	print("============================================================================")
+	inputstr += '}'
+	if not os.path.isdir(STATEMENT_PATH):
+		os.mkdir(STATEMENT_PATH)
+	f1 = open(MY_STATUS_PATH,'w')
+	f1.write(inputstr.encode('utf-8'))
+	f1.close
+
+def contests_result(assign_name):
+	with open(ASSIGNMENT_MAPPING_PATH, "rt") as json_in:
+		assign_to_config = json.load(json_in)
+	if assign_name not in assign_to_config:
+		print("Invalid Assign Number!")
+		print("Available names are:")
+		for hwmap in assign_to_config:
+			print("- " + cyan_wrapper(hwmap + " [" + assign_to_config[hwmap]['contest_name'] + "]"))
+		print("If you want to update latest homework assignment, type: [oj update] to update.")
+		return
+	contest_id, problem_id = (
+        assign_to_config[assign_name]["contest_id"],
+        assign_to_config[assign_name]["contest_problem_id"],
+    )
+	endpoint = "contest_rank?myself=0&contest_id={}&limit=100".format(
+        contest_id
+    )
+	result = json.loads(curl("get", endpoint=endpoint, use_x_csrf_token=True))
+	if result["error"] == "error":
+		print("Error : " + result["data"])
+		return
+	endpoint = "contest/problem?contest_id={}&problem_id={}".format(
+        contest_id,
+		assign_name
+    )
+	result2 = json.loads(curl("get", endpoint=endpoint, use_x_csrf_token=True))
+	if result2["error"] == "error":
+		print("Error : " + result2["data"])
+		return
+	result = result["data"]["results"]
+	result2 = result2["data"]
+	status_to_response = {
+			-1: red_wrapper("WA(Wrong Answer)"),  # WA
+			-2: cyan_wrapper("CE(Compilation Error)"),  # CE
+			0: green_wrapper("AC(Accept)"),  # AC
+			1: purple_wrapper("TLE(Time Limit Exceeded)"),  # TLE
+			2: purple_wrapper("TLE(Time Limit Exceeded)"),  # TLE
+			3: purple_wrapper("MLE(Memory Limit Exceeded)"),  # ML 
+			4: purple_wrapper("RE(Runtime Error)"),  # RE
+			8: cyan_wrapper("PAC(Partial Accepted)")
+			}
+	if result2["my_status"] == None:
+		print("Your status of " + assign_to_config[assign_name]["contest_problem_id"] + " : No record")
+	else:
+		print("Your status of " + assign_to_config[assign_name]['contest_problem_id'] + " : " + status_to_response[result2["my_status"]])
+	print("================================================")
+	blockstatus=[0,0,0,0,0,0,0,0,0,0]
+	for usr in result:
+		try:
+			problem_index = str(assign_to_config[assign_name]["problem_id"])
+			blocks = usr["submission_info"][problem_index]/10
+			blocks -= 1
+			if blocks <= 0:
+				blocks = 0
+			blockstatus[blocks] += 1
+		except:
+			continue
+	ic = 0
+	for i in blockstatus:
+		stastr = ''
+		if ic == 0:
+			try:
+				print(' {:3}~{:3} :{:3}  |  {:35} : {}'.format(ic+1,ic+10,i,status_to_response[0],result2["statistic_info"]["0"]))
+			except:
+				print(' {:3}~{:3} :{:3}  |  {:35} : {}'.format(ic+1,ic+10,i,status_to_response[0],0))
+		elif ic == 10:
+			try:
+				print(' {:3}~{:3} :{:3}  |  {:35} : {}'.format(ic+1,ic+10,i,status_to_response[4],result2["statistic_info"]["4"]))
+			except:
+				print(' {:3}~{:3} :{:3}  |  {:35} : {}'.format(ic+1,ic+10,i,status_to_response[4],0))
+		elif ic == 20:
+			try:
+				print(' {:3}~{:3} :{:3}  |  {:35} : {}'.format(ic+1,ic+10,i,status_to_response[8],result2["statistic_info"]["8"]))
+			except:
+				print(' {:3}~{:3} :{:3}  |  {:35} : {}'.format(ic+1,ic+10,i,status_to_response[8],0))
+		elif ic == 30:
+			try:
+				print(' {:3}~{:3} :{:3}  |  {:35} : {}'.format(ic+1,ic+10,i,status_to_response[-1],result2["statistic_info"]["-1"]))
+			except:
+				print(' {:3}~{:3} :{:3}  |  {:35} : {}'.format(ic+1,ic+10,i,status_to_response[-1],0))
+		elif ic == 40:
+			try:
+				print(' {:3}~{:3} :{:3}  |  {:35} : {}'.format(ic+1,ic+10,i,status_to_response[-2],result2["statistic_info"]["-2"]))
+			except:
+				print(' {:3}~{:3} :{:3}  |  {:35} : {}'.format(ic+1,ic+10,i,status_to_response[-2],0))
+		elif ic == 50:
+			try:
+				print(' {:3}~{:3} :{:3}  |  {:35} : {}'.format(ic+1,ic+10,i,status_to_response[1],result2["statistic_info"]["1"] + result2["statistic_info"]["2"]))
+			except:
+				try:
+					print(' {:3}~{:3} :{:3}  |  {:35} : {}'.format(ic+1,ic+10,i,status_to_response[1],result2["statistic_info"]["2"]))
+				except:
+					try:
+						print(' {:3}~{:3} :{:3}  |  {:35} : {}'.format(ic+1,ic+10,i,status_to_response[1],result2["statistic_info"]["1"]))
+					except:
+						print(' {:3}~{:3} :{:3}  |  {:35} : {}'.format(ic+1,ic+10,i,status_to_response[1],0))
+		elif ic == 60:
+			print(' {:3}~{:3} :{:3}  |--------------------------------'.format(ic+1,ic+10,i))
+		elif ic == 70:
+			print(' {:3}~{:3} :{:3}  |  {:24} : {}'.format(ic+1,ic+10,i,"Total submissions",result2["submission_number"]))
+		else:
+			print(' {:3}~{:3} :{:3}  |'.format(ic+1,ic+10,i))
+		ic += 10
+	print("================================================\nFor real time score ranking, please go to the website.")
diff --git a/commands/download.py b/commands/download.py
new file mode 100755
index 0000000..70e4231
--- /dev/null
+++ b/commands/download.py
@@ -0,0 +1,28 @@
+import json
+from collections import defaultdict
+from os import stat
+
+from constants import HOST, MY_STATUS_PATH
+from util.colors import cyan_wrapper, green_wrapper, purple_wrapper, red_wrapper, gray_wrapper
+from util.curl import curl
+from .status import status
+
+
+def dl(assign_name):
+	submission_id = ''
+	with open(MY_STATUS_PATH, "rt") as json_in:
+		status_config = json.load(json_in)
+		if assign_name in status_config:
+			submission_id = status_config[assign_name]["id"]
+		else:
+			print("Invalid ID! Please use[oj mystat <assign_no>] to get ID")
+			return
+	endpoint = "submission?id={}".format(submission_id)
+	result = json.loads(curl("GET", endpoint=endpoint, use_x_csrf_token=True))
+	response_data = result["data"]
+	status(submission_id)
+	dirname = response_data["username"] + "|" + response_data["id"] + ".c"
+	with open(dirname, "wt") as fout:                                                                                                                  
+		fout.write(response_data["code"])
+	print("Downloaded your file!!!\nFile name:{} in yor current directory.".format(dirname))
+	#print(response_data["code"])
diff --git a/commands/get_assign.py b/commands/get_assign.py
index c12b990..d74aa87 100755
--- a/commands/get_assign.py
+++ b/commands/get_assign.py
@@ -1,15 +1,25 @@
 import json
 import os
+#from BeautifulSoup import BeautifulSoup as bs
 
 from constants import ASSIGNMENT_MAPPING_PATH
 from util.curl import curl
+from util.colors import cyan_wrapper, red_wrapper
 
 
 def get_assign(assign_name):
-    with open(ASSIGNMENT_MAPPING_PATH, "rt") as json_in:
-        assign_to_config = json.load(json_in)
+    try:
+        with open(ASSIGNMENT_MAPPING_PATH, "rt") as json_in:
+            assign_to_config = json.load(json_in)
+    except:
+        print(red_wrapper("Can not find assign mapping, did you already run ") + cyan_wrapper("oj update ") + red_wrapper("?"))
+        return
     if assign_name not in assign_to_config:
         print("Invalid Assign Number!")
+        print("Available names are:")
+        for hwmap in assign_to_config:
+            print("- " + cyan_wrapper(hwmap + " [" + assign_to_config[hwmap]['contest_name'] + "]"))
+        print("If you want to update latest homework assignment, type: [oj update] to update.")
         return
     contest_id, problem_id = (
         assign_to_config[assign_name]["contest_id"],
@@ -33,9 +43,10 @@ def get_assign(assign_name):
     if "C" in data["template"]:
         template = data["template"]["C"]
     else:
-        template = "#include <stdio.h>\n\nint main() {\n  \n  return 0;\n}\n"
-    dir_name = assign_name
-    template_path = dir_name + "/" + "{}.c".format(assign_name)
+        template = "#include <stdio.h>\n\nint main() {\n    \n    return 0;\n}\n"
+    dir_name = data["_id"]
+    print("Made a [{}] folder in your current directory.".format(dir_name))
+    template_path = dir_name + "/main.c"
     if not os.path.isdir(dir_name):
         os.mkdir(dir_name)
     with open(template_path, "wt") as fout:
@@ -45,8 +56,14 @@ def get_assign(assign_name):
         input_sample_path = dir_name + "/" + "{}.in".format(sample_num)
         input_ = sample["input"]
         with open(input_sample_path, "wt") as fout:
-            fout.write(input_)
+            try:
+                fout.write(input_)
+            except:
+                print("ERROR: None-ascii character in input file")
         output_sample_path = dir_name + "/" + "{}.out".format(sample_num)
         output = sample["output"]
         with open(output_sample_path, "wt") as fout:
-            fout.write(output)
+            try:
+                fout.write(output)
+            except:
+                print("ERROR: None-ascii character in input file")
diff --git a/commands/get_problem.py b/commands/get_problem.py
index d2255f7..600f6fb 100755
--- a/commands/get_problem.py
+++ b/commands/get_problem.py
@@ -1,12 +1,23 @@
 import json
 import os
 
-from constants import TEMPLATE_FILENAME
+from constants import TEMPLATE_FILENAME, PROBLEM_MAPPING_PATH
 from util.curl import curl
+from util.colors import cyan_wrapper, red_wrapper
 
 
 def get_problem(problem_id):
-    endpoint = "problem?problem_id={}".format(problem_id)
+    try:
+        with open(PROBLEM_MAPPING_PATH, "rt") as json_in:
+            problem_to_config = json.load(json_in)
+    except:
+        print(red_wrapper("Can not find problem mapping, did you already run ") + cyan_wrapper("oj update_p") + red_wrapper("?"))
+        return
+    if problem_id not in problem_to_config:
+        print(cyan_wrapper("Invalid problem id!") + " Please confirm your input.")
+        return
+    pid = problem_to_config[problem_id]["query_id"]
+    endpoint = "problem?problem_id={}".format(pid)
     result = json.loads(curl("get", endpoint=endpoint, use_x_csrf_token=True))
     data = result["data"]
     if not data:
@@ -17,29 +28,39 @@ def get_problem(problem_id):
         templates = data["template"]
         languages = data["languages"]
     except:
-        print("Unexpected Error in Parsing Response")
+        print("Unexpected Error in Parsing Response:")
+        print(data)
         return
     dir_name = "problem_{}".format(problem_id)
     if not os.path.isdir(dir_name):
         os.mkdir(dir_name)
-
+        print("Made a [{}] folder in your current directory.".format(dir_name))
     for language in languages:
         if language not in templates:
             continue
         template_file = dir_name + "/{}".format(TEMPLATE_FILENAME[language])
         content = templates[language]
         with open(template_file, "wt") as fout:
-            fout.write(content)
+            try:
+                fout.write(content)
+            except:
+                print("None-ascii character in template")
             # TODO: Update to support utf-8 encoding.
     for idx, sample in enumerate(samples):
         sample_num = idx + 1
         input_sample_path = dir_name + "/" + "{}.in".format(sample_num)
         input_ = sample["input"]
         with open(input_sample_path, "wt") as fout:
-            fout.write(input_)
+            try:
+                fout.write(input_)
+            except:
+                print("None-ascii character in input file")
             # TODO: Update to support utf-8 encoding.
         output_sample_path = dir_name + "/" + "{}.out".format(sample_num)
         output = sample["output"]
         with open(output_sample_path, "wt") as fout:
-            fout.write(output)
+            try:
+                fout.write(output)
+            except:
+                print("None-ascii character in ouput file")
             # TODO: Update to support utf-8 encoding.
diff --git a/commands/grade.py b/commands/grade.py
new file mode 100644
index 0000000..1015860
--- /dev/null
+++ b/commands/grade.py
@@ -0,0 +1,79 @@
+import json
+import csv
+import os
+from util.curl import curl
+
+GRADE_CSV = "./Grade.csv"
+
+def write_csv(data = None):
+    with open(GRADE_CSV, 'a') as csvfile:
+        writer = csv.writer(csvfile)
+        writer.writerow(data)
+
+def get_grades(contest):
+    # fetch contest ID
+    print("[info] fetch contest ID...")
+    endpoint = "contests?offset=0&limit=20&keyword=&rule_type=&status="	
+    result = json.loads(curl("GET", endpoint=endpoint, use_x_csrf_token=True))
+    contestID = None
+    for r in result["data"]["results"]:
+        if contest in r["title"]:
+            contestID = r["id"]
+    if contestID == None:
+        print("Invalid contest name")
+        return
+
+    # fetch all users
+    print("[info] fetch all users...")
+    allUsers = []
+    current, total = 0, 1
+    while current < total:
+        endpoint = "contest_rank?offset={}&limit=50&contest_id={}".format(current, contestID)
+        result = json.loads(curl("GET", endpoint=endpoint, use_x_csrf_token=True))
+        for r in result["data"]["results"]:
+            try:
+                allUsers.append(str(r["user"]["username"]))
+            except:
+                allUsers.append(str(r["user"]["id"]))
+        current, total = current + 50, result["data"]["total"]
+    # fetch all hw
+    print("[info] fetch all hw...")
+    allHW = []
+    current, total = 0, 1
+    while current < total:
+        endpoint = "admin/contest/problem?keyword&offset={}&limit=50&contest_id={}".format(current, contestID)
+        result = json.loads(curl("GET", endpoint=endpoint, use_x_csrf_token=True))
+        print(result)
+        for r in result["data"]["results"]:
+            allHW.append(str(r["_id"]))
+        current, total = current + 50, result["data"]["total"]
+
+    # write csv
+    if os.path.isfile(GRADE_CSV):
+        os.remove(GRADE_CSV)
+    allUsers.insert(0, "")
+    write_csv(allUsers)
+    allUsers.remove("")
+
+    print("[info] fetch user status...")
+    userACMap = {}
+    for user in allUsers:
+        current, total = 0, 1
+        while current < total:
+            ACSet = set()
+            endpoint = "contest_submissions?contest_id={}&result=0&username={}&limit=100&offset={}".format(contestID, user, current)
+            result = json.loads(curl("GET", endpoint=endpoint, use_x_csrf_token=True))
+            for r in result["data"]["results"]:
+                ACSet.add(str(r["problem"]))
+            current, total = current + 100, result["data"]["total"]
+        userACMap[user] = list(ACSet)
+    print("[info] write csv")
+    for hw in allHW:
+        data = [hw]
+        for user in allUsers:
+            if hw in userACMap[user]:
+                data.append(100)
+            else:
+                data.append(0)
+        write_csv(data)
+    print("[info] finish!")
\ No newline at end of file
diff --git a/commands/login.py b/commands/login.py
index 4fb2eab..93185ac 100755
--- a/commands/login.py
+++ b/commands/login.py
@@ -3,29 +3,35 @@
 from getpass import getpass
 
 from constants import COOKIES_DIR
+from constants import COOKIES_PATH
 from util.common import get_csrf_token
 from util.curl import curl
-
+from util.colors import green_wrapper
 
 def login():
-    username = raw_input("Username: ")
-    passwd = getpass("Password: ")
-    payload = {
-        "username": username,
-        "password": passwd,
-        "csrfmiddlewaretoken": get_csrf_token(),
-    }
-    result = curl("post", payload=payload, endpoint="login/", use_x_csrf_token=True)
-    result = json.loads(result)
-    print("%s!!" % result["data"])
-
+	username = raw_input("Username: ")
+	passwd = getpass("Password: ")
+	payload = {
+		"username": username,
+		"password": passwd,
+	}
+	tfa_required = curl("post", payload={"username": username}, endpoint="tfa_required/", use_x_csrf_token=True)
+	tfa_required = json.loads(tfa_required)
+	if tfa_required["data"]["result"] == True:
+		tfa_code = raw_input("TFA code: ")
+		payload["tfa_code"] = tfa_code
+	result = curl("post", payload=payload, endpoint="login/", use_x_csrf_token=True)
+	result = json.loads(result)
+	print("%s!!" % result["data"])
+	os.chmod(COOKIES_PATH, 0700)
 
 def fetch_csrf_token():
-    if not os.path.isdir(COOKIES_DIR):
-        os.mkdir(COOKIES_DIR)
-    curl("get", endpoint="profile/")
-
+	if not os.path.isdir(COOKIES_DIR):
+		os.mkdir(COOKIES_DIR)
+	if os.path.isfile(COOKIES_PATH):
+		os.remove(COOKIES_PATH)
+	curl("get", endpoint="profile/")
 
 def auth():
-    fetch_csrf_token()
-    login()
+	fetch_csrf_token()
+	login()
diff --git a/commands/problem.py b/commands/problem.py
new file mode 100755
index 0000000..f7148de
--- /dev/null
+++ b/commands/problem.py
@@ -0,0 +1,59 @@
+import json
+import time
+
+from constants import PROBLEM_MAPPING_PATH
+from util.curl import curl
+from .status import status
+from util.colors import cyan_wrapper, green_wrapper
+
+def problem_submit(problem_id, filename): 
+    with open(PROBLEM_MAPPING_PATH, "rt") as json_in:
+        problem_to_config = json.load(json_in)
+        if problem_id not in problem_to_config:
+            print(cyan_wrapper("Invalid problem id!") + " Please confirm your input.")
+            return
+    try:
+        with open(filename, "r") as fin:
+            code = fin.read()
+    except IOError:
+        print('File "' + filename + '" does not exist!')
+        return
+    endpoint = "submission"
+    code_type = ""
+    if(filename.split(".")[-1] == "cpp"):
+        code_type = "C++"
+    elif(filename.split(".")[-1] == "c"):
+        code_type = "C"
+    elif(filename.split(".")[-1] == "go"):
+        code_type = "Golang"
+    elif(filename.split(".")[-1] == "java"):
+        code_type = "Java"
+    elif(filename.split(".")[-1] == "py"):
+        type_ = input("Choose Python version (2/3): ")
+        if(type_ == 2):
+            code_type = "Python2"
+        elif(type_ == 3):
+            code_type = "Python3"
+    else:
+        print("Wrong file format.")
+        return
+    
+    payload = {
+        "problem_id": problem_to_config[problem_id]["_id"],
+        "language":code_type,
+        "code": code,
+    }
+    try:
+        submission_response = json.loads(
+            curl("POST", payload=payload, endpoint=endpoint, use_x_csrf_token=True)
+        )
+    except ValueError:
+        print("No response is received! Please contact class TA!")
+    if submission_response["error"] != None:
+        print(submission_response["data"])
+        return
+    submission_id = submission_response["data"]["submission_id"]
+    print(green_wrapper("Submit successfully!!"))
+    print("Getting submission status...".format(submission_id))
+    time.sleep(1.0)
+    status(submission_id)
diff --git a/commands/status.py b/commands/status.py
old mode 100644
new mode 100755
index f2da6a0..d4b0424
--- a/commands/status.py
+++ b/commands/status.py
@@ -1,40 +1,67 @@
 import json
 from collections import defaultdict
 from os import stat
+import time
 
 from constants import HOST
-from util.colors import cyan_wrapper, green_wrapper, purple_wrapper, red_wrapper
+from util.colors import cyan_wrapper, green_wrapper, purple_wrapper, red_wrapper, gray_wrapper
 from util.curl import curl
 
 
 def status(submission_id):
-    endpoint = "submission?id={}".format(submission_id)
-    result = json.loads(curl("GET", endpoint=endpoint, use_x_csrf_token=True))
-    response_data = result["data"]
-    if response_data == "Submission doesn't exist":
-        print("Submission doesn't exist")
-        return
-    print("Your code has been graded! Here's your results:\n")
-    status_to_response = {
-        -1: lambda idx: red_wrapper("Testcase {}: WA(Wrong Answer)".format(idx)),  # WA
-        -2: lambda idx: cyan_wrapper(
-            "Testcase {}: CE(Compilation Error)".format(idx)
-        ),  # CE
-        0: lambda idx: green_wrapper("Testcase {}: AC(Accept)".format(idx)),  # AC
-        2: lambda idx: "Testcase {}: TLE(Time Limit Exceeded)".format(idx),  # TLE
-        3: lambda idx: "Testcase {}: MLE(Memory Limit Exceeded)".format(idx),  # MLE
-        4: lambda idx: purple_wrapper(
-            "Testcase {}: RE(Runtime Error)".format(idx)
-        ),  # RE
-    }
-    if "data" not in response_data["info"]:
-        print(cyan_wrapper("CE(Compilation Error) before running testing"))
-        return
-    for idx, ans in enumerate(response_data["info"]["data"]):
-        test_case_no = idx + 1
-        answers_status = ans["result"]
-        if answers_status not in status_to_response:
-            print("Testcase {}: SE(System Error)".format(test_case_no))
-            continue
-        print(status_to_response[answers_status](test_case_no))
-    print("For graphical results,\nplease visit: " + HOST + "status/" + submission_id)
+	endpoint = "submission?id={}".format(submission_id)
+	result = json.loads(curl("GET", endpoint=endpoint, use_x_csrf_token=True))
+	this_result = result["data"]["result"]
+	error_counter = 0
+	while(str(this_result) == "7" and error_counter < 10):
+		time.sleep(1.0)
+		result = json.loads(curl("GET", endpoint=endpoint, use_x_csrf_token=True))
+		this_result = result["data"]["result"]
+		error_counter += 1
+	response_data = result["data"]
+	status_to_response = {
+		-1: red_wrapper("WA(Wrong Answer)"),  # WA
+		-2: cyan_wrapper("CE(Compilation Error)"),  # CE
+		0: green_wrapper("AC(Accept)"),  # AC
+		1: purple_wrapper("TLE(TimeLimitExceeded)"),  # TLE
+		3: purple_wrapper("MLE(MemoryLimitExceeded)"),  # MLE
+		4: purple_wrapper("RE(Runtime Error)"),  # RE
+		8: cyan_wrapper("PAC(Partial Accepted)")
+	}
+	if "info" in response_data:
+		if response_data == "Submission doesn't exist":
+			print("Submission doesn't exist")
+			return
+		print("========================================================")
+		try:
+			print("Result: {:40}  Score:{:4}".format(status_to_response[this_result],response_data["statistic_info"]["score"]))
+			if "data" not in response_data["info"]:
+				print(gray_wrapper(response_data["statistic_info"]["err_info"]))
+				print("========================================================")
+				return
+			print("|ID |Status                       |   Time|  Mem| Score|")
+			for ans in result["data"]["info"]["data"]:
+				print("|#{:2}|{:40}|{:5}ms|{:3}MB| {:5}|".format(ans["test_case"],status_to_response[ans["result"]], ans["real_time"], (ans["memory"]/1048576)+1, ans["score"]))
+			print("========================================================")
+		except:
+			print(result)
+			print("Bad response! Please check your internet connection and ask TAs!")
+	else:
+		if response_data == "Submission doesn't exist":
+			print("Submission doesn't exist")
+			return
+		print("==============================================")
+		try:
+			print("Result: {:40}".format(status_to_response[this_result]))
+			if "err_info" in response_data["statistic_info"]:
+				print(gray_wrapper(response_data["statistic_info"]["err_info"]))
+				print("==============================================")
+				return
+			print("|Status                       |   Time|  Mem|")
+			print("|{:40}|{:5}ms|{:3}MB|".format(status_to_response[this_result], response_data["statistic_info"]["time_cost"], (response_data["statistic_info"]["memory_cost"]/1048576)+1))
+			print("==============================================")
+		except:
+			print(result)
+			print("Bad response! Please check your internet connection and ask TAs!")
+
+	
diff --git a/commands/submit.py b/commands/submit.py
index 6746c30..21e92ed 100755
--- a/commands/submit.py
+++ b/commands/submit.py
@@ -3,15 +3,18 @@
 
 from constants import ASSIGNMENT_MAPPING_PATH
 from util.curl import curl
-
 from .status import status
-
+from util.colors import cyan_wrapper
 
 def submit(assign_number, filename):
     with open(ASSIGNMENT_MAPPING_PATH, "rt") as json_in:
         assign_to_config = json.load(json_in)
     if assign_number not in assign_to_config:
         print("Invalid Assign Number!")
+        print("Available names are:")
+        for hwmap in assign_to_config:
+            print("- " + cyan_wrapper(hwmap + " [" + assign_to_config[hwmap]['contest_name'] + "]"))
+        print("If you want to update latest homework assignment, type: [oj update] to update.")
         return
     contest_id, problem_id = (
         assign_to_config[assign_number]["contest_id"],
@@ -25,11 +28,18 @@ def submit(assign_number, filename):
         return
     payload = {
         "problem_id": problem_id,
-        "language": "C",
         "code": code,
         "contest_id": contest_id,
     }
     endpoint = "submission"
+    type = filename.split(".")[-1]
+    if type == "c":
+        payload["language"] = "C"
+    elif type == "cpp":
+        payload["language"] = "C++"
+    else:
+        print("Wrong file format.")
+        return
 
     try:
         submission_response = json.loads(
@@ -45,12 +55,15 @@ def submit(assign_number, filename):
     try:
         submission_id = response_data["submission_id"]
     except TypeError:
-        print("Unknown error occuried!")
+        if submission_response["error"] == "invalid-code":
+            print("You can't submit empty file.'")
+            return
+        print("Error occuried!")
+        print(submission_response["data"])
         return
     print(
         "Submit successfully!\n"
-        "Your submission Id is {}\n"
         "Getting submission status...".format(submission_id)
     )
-    time.sleep(0.6)
-    status(submission_id)
+    time.sleep(1.0)
+    status(submission_id)
\ No newline at end of file
diff --git a/commands/update_contest.py b/commands/update_contest.py
new file mode 100755
index 0000000..aa5db6c
--- /dev/null
+++ b/commands/update_contest.py
@@ -0,0 +1,55 @@
+import json
+import os
+
+from constants import ASSIGNMENT_MAPPING_PATH, STATEMENT_PATH, CONTEST_NAME
+from util.curl import curl
+from util.colors import cyan_wrapper, green_wrapper, red_wrapper
+
+def update_contest_map():
+	if not os.path.isdir(STATEMENT_PATH):
+		os.mkdir(STATEMENT_PATH)
+	os.chmod(STATEMENT_PATH, 0700)
+	print("Target Contest: " + cyan_wrapper(CONTEST_NAME))
+	endpoint = "contests?offset=0&limit=10&status=0"
+	inputstr = '{'
+	result = json.loads(curl("get", endpoint=endpoint, use_x_csrf_token=True))
+	counter = 1
+	result2 = ""
+	for i in range(0,len(result['data']['results'])):
+		if(result['data']['results'][i]['title'] != CONTEST_NAME):
+			continue
+		contestid = result['data']['results'][i]['id']
+		payload = {
+				"contest_id" : str(contestid)
+				}
+		endpoint = "contest/problem?contest_id=" + str(contestid)
+		result2 = json.loads(curl("get", payload=payload, endpoint=endpoint, use_x_csrf_token=True))
+		if result2["error"] == "error":
+			print("Error : " + result2["data"])
+			continue
+		for problems in range(0,len(result2['data'])):
+			c_id = result2['data'][problems]['_id']
+			name = result2['data'][problems]['title']
+			r_id =  result2['data'][problems]['id']
+			try:
+				print("Found HomeWork: " + cyan_wrapper(str(c_id) + " [" + name + "]"))
+			except:
+				print("Found HomeWork: " + cyan_wrapper(str(c_id) + " [" + str(c_id) + "]"))
+			if counter != 1:
+				inputstr += ','
+			try:
+				inputstr += '"' + str(c_id) + '":{"contest_name":"' + str(name) + '","contest_id":' + str(contestid) + ',"contest_problem_id":"' + str(c_id)+ '","problem_id":' + str(r_id) + '}'
+			except:
+				inputstr += '"' + str(c_id) + '":{"contest_name":"' + str(c_id) + '","contest_id":' + str(contestid) + ',"contest_problem_id":"' + str(c_id)+ '","problem_id":' + str(r_id) + '}'
+			counter += 1
+	inputstr += '}'
+	if not os.path.isdir(STATEMENT_PATH):
+		os.mkdir(STATEMENT_PATH)
+	f = open(ASSIGNMENT_MAPPING_PATH,'w')
+	f.write(inputstr.encode("utf-8"))
+	f.close
+	if result2["error"] == "error":
+		print(red_wrapper("Fail updating assign!"))
+	else:
+		print(green_wrapper("Updated assign successfully!"))
+	
diff --git a/commands/update_problem.py b/commands/update_problem.py
new file mode 100755
index 0000000..ad16a27
--- /dev/null
+++ b/commands/update_problem.py
@@ -0,0 +1,28 @@
+import json
+import os
+
+from constants import PROBLEM_MAPPING_PATH, STATEMENT_PATH, CONTEST_NAME
+from util.curl import curl
+from util.colors import green_wrapper
+
+def update_problem_map():
+	if not os.path.isdir(STATEMENT_PATH):
+		os.mkdir(STATEMENT_PATH)
+	os.chmod(STATEMENT_PATH, 0700)
+	endpoint = "problem?offset=0&limit=200"
+	inputstr = '{'
+	result = json.loads(curl("get", endpoint=endpoint, use_x_csrf_token=True))
+	counter_1 = 1
+	for i in range(0,len(result['data']['results'])):
+		real_id = result['data']['results'][i]['id']
+		display_id = result['data']['results'][i]['_id'].replace(" ","")
+		if counter_1 != 1:
+			inputstr += ','
+		inputstr += '"' + str(display_id) + '":{"_id":"' + str(real_id) + '","query_id":"' + result['data']['results'][i]['_id'].replace(" ","+") + '"}'
+		counter_1+=1
+	inputstr += '}'
+	f = open(PROBLEM_MAPPING_PATH,'w')
+	f.write(inputstr.encode("utf-8"))
+	f.close
+	print(green_wrapper("Updated problems successfully!"))
+	
diff --git a/constants.py b/constants.py
old mode 100644
new mode 100755
index ec19503..56f8ad0
--- a/constants.py
+++ b/constants.py
@@ -1,16 +1,21 @@
 from os.path import dirname, expanduser, realpath
 
-HOST = "<URL>"
-API_HOST = HOST + "api"
+HOST = "https://oj.ebg.tw/"
+CONTEST_NAME = "1121CP1"
 
-CONTENT_TYPE_OPTION = " -H 'Content-Type: application/json' "
 
+API_HOST = HOST + "api"
+CONTENT_TYPE_OPTION = " -H 'Content-Type: application/json' "
 home = expanduser("~")
 COOKIES_DIR = home + "/.cookies/"
 COOKIES_NAME = "oj_cookies"
 COOKIES_PATH = COOKIES_DIR + COOKIES_NAME
 
-ASSIGNMENT_MAPPING_PATH = dirname(realpath(__file__)) + "/assign_mapping.json"
+ASSIGNMENT_MAPPING_PATH = home + "/oj_statement/assign_mapping.json"
+MY_STATUS_PATH = home + "/oj_statement/status_log.json"
+PROBLEM_MAPPING_PATH = home + "/oj_statement/problem_mapping.json"
+STATEMENT_PATH = home + "/oj_statement/"
+
 
 TEMPLATE_FILENAME = {
     "C": "main.c",
diff --git a/oj.py b/oj.py
index 1783580..f9ca049 100755
--- a/oj.py
+++ b/oj.py
@@ -1,12 +1,11 @@
 #!/opt/csw/bin/python2.7
-
 import argparse
 
-from commands import auth, get_assign, get_problem, status, submit
+from commands import auth, get_assign, get_problem, status, submit, update_contest_map, update_problem_map, contests_result, contests_status, my_contests_status,dl, problem_submit, get_grades
 
 parser = argparse.ArgumentParser(
     prog="oj",
-    description="CLI tool that helping you access CP Online Judge",
+    description="https://github.com/andyjjrt/oj-cli#oj-cli",
 )
 subparsers = parser.add_subparsers(dest="subcmd")
 parser_login = subparsers.add_parser(
@@ -14,14 +13,45 @@
 )
 parser_login.set_defaults(func=auth)
 
+parser_update = subparsers.add_parser(
+    "update", description="Update your Assign and Exercise Homework"
+)
+parser_login.set_defaults(func=update_contest_map)
+
+parser_update = subparsers.add_parser(
+    "update_p", description="Update your Problems"
+)
+parser_login.set_defaults(func=update_problem_map)
+
 parser_get_assign = subparsers.add_parser(
-    "get_assign", description="Get assignment/exercise from contest"
+    "get", description="Get assignment/exercise from contest"
 )
 parser_get_assign.add_argument("assign_no", type=str, help="assignment number")
 parser_get_assign.set_defaults(func=get_assign)
 
+
+parser_contest = subparsers.add_parser(
+    "mystat", description="Show your latest 20 submissions of the specific contest or show specific submission status."
+)
+parser_contest.add_argument("assign_no", type=str, help="assignment number or submitID")
+parser_contest.set_defaults(func=my_contests_status)
+
+parser_contest = subparsers.add_parser(
+    "status", description="Show the latest 20 submissions of the specific contest."
+)
+parser_contest.add_argument("assign_no", type=str, help="assignment number")
+parser_contest.set_defaults(func=contests_status)
+
+parser_contest = subparsers.add_parser(
+    "rank", description="Show the score of the whole class."
+)
+parser_contest.add_argument("assign_no", type=str, help="assignment number")
+parser_contest.set_defaults(func=contests_result)
+
+
+
 parser_get_problem = subparsers.add_parser(
-    "get_problem", description="Get problem from public problem"
+    "get_p", description="Get problem from public problem"
 )
 parser_get_problem.add_argument("problem_id", type=str, help="problem display ID")
 
@@ -31,16 +61,33 @@
 parser_submit.add_argument("assign_no", type=str, help="assignment number")
 parser_submit.add_argument("code_file", type=str, help="file of your codes")
 
-parser_status = subparsers.add_parser("status", description="Get submission status")
-parser_status.add_argument("submission_id", type=str, help="the submission id")
+parser_dl = subparsers.add_parser("dl", description="Get submission source code")
+parser_dl.add_argument("submission_id", type=str, help="Your submission ID")
+
+parser_problem_submit = subparsers.add_parser(
+    "submit_p", description="Submit your probkem answer and grade your code"
+)
+parser_problem_submit.add_argument("problem_id", type=str, help="problem id")
+parser_problem_submit.add_argument("code_file", type=str, help="file of your codes")
+
+parser_grades = subparsers.add_parser("grades", description="get grades from contest")
+parser_grades.add_argument("contest", type=str, help="contest name")
+
 
 args = parser.parse_args()
 cmd_to_func = {
     "login": auth,
-    "get_assign": lambda: get_assign(args.assign_no),
-    "get_problem": lambda: get_problem(args.problem_id),
+	"update": update_contest_map,
+    "update_p": update_problem_map,
+    "get": lambda: get_assign(args.assign_no),
+    "get_p": lambda: get_problem(args.problem_id),
     "submit": lambda: submit(args.assign_no, args.code_file),
-    "status": lambda: status(args.submission_id),
+	"submit_p": lambda: problem_submit(args.problem_id, args.code_file), 
+	"status": lambda: contests_status(args.assign_no),
+	"mystat": lambda: my_contests_status(args.assign_no),
+	"rank": lambda: contests_result(args.assign_no),
+	"dl": lambda: dl(args.submission_id),
+    "grades": lambda:get_grades(args.contest),
 }
 
 
diff --git a/util/__init__.py b/util/__init__.py
old mode 100644
new mode 100755
diff --git a/util/colors.py b/util/colors.py
old mode 100644
new mode 100755
index 7b76cde..2596817
--- a/util/colors.py
+++ b/util/colors.py
@@ -3,6 +3,7 @@
 red = "\033[0;31m"
 end = "\033[0m"
 cyan = "\033[0;36m"
+gray = "\033[0;37m"
 
 
 def mkcolor(color=end):
@@ -16,3 +17,4 @@ def styleize_text(text):
 green_wrapper = mkcolor(green)
 red_wrapper = mkcolor(red)
 cyan_wrapper = mkcolor(cyan)
+gray_wrapper = mkcolor(gray)
diff --git a/util/common.py b/util/common.py
old mode 100644
new mode 100755
index 7c38229..9e002a9
--- a/util/common.py
+++ b/util/common.py
@@ -1,14 +1,17 @@
 from constants import COOKIES_PATH
-
+from util.colors import red_wrapper
 
 def get_csrf_token():
     csrf_token = None
-    with open(COOKIES_PATH) as fin:
-        for line in fin:
-            line = line.strip()
-            if line == "" or line[0] == "#":
-                continue
-            line = line.strip().split("\t")
-            if line[-2] == "csrftoken":
-                csrf_token = line[-1]
-                return csrf_token
+    try:
+        with open(COOKIES_PATH) as fin:
+            for line in fin:
+                line = line.strip()
+                if line == "" or line[0] == "#":
+                    continue
+                line = line.strip().split("\t")
+                if line[-2] == "csrftoken":
+                    csrf_token = line[-1]
+                    return csrf_token
+    except:
+        print(red_wrapper("cookie file not found or parsing error"))
diff --git a/util/curl.py b/util/curl.py
old mode 100644
new mode 100755
index ff7784a..25f9cab
--- a/util/curl.py
+++ b/util/curl.py
@@ -2,10 +2,10 @@
 import re
 from subprocess import check_output
 
-from constants import API_HOST, CONTENT_TYPE_OPTION, COOKIES_PATH
+from constants import API_HOST, CONTENT_TYPE_OPTION, COOKIES_PATH, HOST
 
 from .common import get_csrf_token
-
+from .colors import red_wrapper
 
 def curl(method, payload=None, endpoint="", use_x_csrf_token=False):
     """
@@ -27,6 +27,10 @@ def curl(method, payload=None, endpoint="", use_x_csrf_token=False):
         cmd += " -H 'X-CSRFToken: {x_csrf_token}' ".format(
             x_csrf_token=get_csrf_token()
         )
+        cmd += " -H 'Referer: {HOST}'".format(
+			HOST = HOST
+		)
+    
     if payload:
         cmd += " -d '{data}' ".format(data=re.sub("'", "\u0027", json.dumps(payload)))
     cmd += (' -X {method} "{api_host}/{endpoint}"').format(
@@ -35,5 +39,9 @@ def curl(method, payload=None, endpoint="", use_x_csrf_token=False):
         endpoint=endpoint,
     )
     result = check_output(cmd, shell=True)
-    str(result.decode(encoding="utf8"))
-    return result
+    try:
+        str(result.decode(encoding="utf8"))
+        return result
+    except:
+        print(red_wrapper("\nUTF8 decode Error or other errors.\n"))
+        return