diff --git a/JobHunter/.idea/JobHunter.iml b/JobHunter/.idea/JobHunter.iml
index 85c7612..8b7bd39 100644
--- a/JobHunter/.idea/JobHunter.iml
+++ b/JobHunter/.idea/JobHunter.iml
@@ -4,10 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Python 3.8 (pythonProject)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-  <component name="TestRunnerService">
-    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
-  </component>
 </module>
\ No newline at end of file
diff --git a/JobHunter/.idea/inspectionProfiles/Project_Default.xml b/JobHunter/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..d5468aa
--- /dev/null
+++ b/JobHunter/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,73 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PyPep8Inspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="ignoredErrors">
+        <list>
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+          <option value="W29" />
+          <option value="E501" />
+        </list>
+      </option>
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/JobHunter/.idea/misc.xml b/JobHunter/.idea/misc.xml
index 3d7df4f..f56ad02 100644
--- a/JobHunter/.idea/misc.xml
+++ b/JobHunter/.idea/misc.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (JobHunter)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (pythonProject)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/JobHunter/.idea/vcs.xml b/JobHunter/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/JobHunter/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/JobHunter/.idea/workspace.xml b/JobHunter/.idea/workspace.xml
index 4979846..132120c 100644
--- a/JobHunter/.idea/workspace.xml
+++ b/JobHunter/.idea/workspace.xml
@@ -2,32 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="a28ec8e2-1502-4932-b15d-0c9c3429cb1e" name="Default" comment="" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="JobHunter.py" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/JobHunter.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="705">
-              <caret line="103" column="24" selection-start-line="103" selection-start-column="24" selection-end-line="103" selection-end-column="24" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/JobHunter.py" />
-      </list>
-    </option>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
   </component>
   <component name="ProjectFrameBounds">
     <option name="x" value="12" />
@@ -35,46 +16,49 @@
     <option name="width" value="2538" />
     <option name="height" value="1524" />
   </component>
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Course" />
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="JobHunter" type="b2602c69:ProjectViewProjectNode" />
-              <item name="JobHunter" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
+  <component name="ProjectId" id="1kx0VXgTgcO09gTM0VtACJn0Zwc" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
-    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Users\zrubin\Documents\GitHub\CNA330\JobHunter" />
     </key>
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
+  <component name="RunManager">
+    <configuration name="JobHunter" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+      <module name="JobHunter" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/JobHunter.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
+    <recent_temporary>
       <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
+        <item itemvalue="Python.JobHunter" />
       </list>
-    </option>
+    </recent_temporary>
   </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -88,46 +72,29 @@
     </task>
     <servers />
   </component>
-  <component name="ToolWindowManager">
-    <frame x="8" y="80" width="1692" height="1016" extended-state="0" />
-    <editor active="true" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24970202" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Python Console" order="7" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Terminal" order="7" />
-      <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Find" order="1" />
-    </layout>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/JobHunter.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="124" selection-start-column="124" selection-end-column="124" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/JobHunter.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="705">
-          <caret line="103" column="24" selection-start-line="103" selection-start-column="24" selection-end-line="103" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
+  <component name="WindowStateProjectService">
+    <state width="1308" height="172" key="GridCell.Tab.0.bottom" timestamp="1606629426831">
+      <screen x="0" y="0" width="1366" height="728" />
+    </state>
+    <state width="1308" height="172" key="GridCell.Tab.0.bottom/0.0.1366.728@0.0.1366.728" timestamp="1606629426831" />
+    <state width="1308" height="172" key="GridCell.Tab.0.center" timestamp="1606629426831">
+      <screen x="0" y="0" width="1366" height="728" />
+    </state>
+    <state width="1308" height="172" key="GridCell.Tab.0.center/0.0.1366.728@0.0.1366.728" timestamp="1606629426831" />
+    <state width="1308" height="172" key="GridCell.Tab.0.left" timestamp="1606629426830">
+      <screen x="0" y="0" width="1366" height="728" />
+    </state>
+    <state width="1308" height="172" key="GridCell.Tab.0.left/0.0.1366.728@0.0.1366.728" timestamp="1606629426830" />
+    <state width="1308" height="172" key="GridCell.Tab.0.right" timestamp="1606629426831">
+      <screen x="0" y="0" width="1366" height="728" />
+    </state>
+    <state width="1308" height="172" key="GridCell.Tab.0.right/0.0.1366.728@0.0.1366.728" timestamp="1606629426831" />
+    <state x="184" y="9" key="SettingsEditor" timestamp="1606627093979">
+      <screen x="0" y="0" width="1366" height="728" />
+    </state>
+    <state x="184" y="9" key="SettingsEditor/0.0.1366.728@0.0.1366.728" timestamp="1606627093979" />
   </component>
 </project>
\ No newline at end of file
diff --git a/JobHunter/JobHunter.py b/JobHunter/JobHunter.py
index 0ddd895..a33bc38 100644
--- a/JobHunter/JobHunter.py
+++ b/JobHunter/JobHunter.py
@@ -1,54 +1,77 @@
 # This script pulls from a job website and stores positions into a database. If there is a new posting it notifies the user.
-# CNA 330
-# Zachary Rubin, zrubin@rtc.edu
+# Mohammad Pakizeh Jam
+# CNA330 11/12/2020
 import mysql.connector
 import sys
 import json
 import urllib.request
 import os
 import time
+from datetime import datetime
 
 # Connect to database
 # You may need to edit the connect function based on your local settings.
 def connect_to_sql():
-    conn = mysql.connector.connect(user='root', password='',
-                                  host='127.0.0.1',
+    conn = mysql.connector.connect(user='pythoneverything', password='python123',
+                                  host='18.216.19.4',
                                   database='cna330')
     return conn
-
 # Create the table structure
 def create_tables(cursor, table):
     ## Add your code here. Starter code below
-    cursor.execute('''CREATE TABLE IF NOT EXISTS tablename (id INT PRIMARY KEY); ''')
+    cursor.execute('''CREATE TABLE IF NOT EXISTS Jobs (ID INT PRIMARY KEY auto_increment, 
+    Type varchar(10), 
+    Title varchar(100), 
+    Description text CHARSET utf8,
+    Job_id varchar(36), 
+    Created_at DATE, 
+    Company varchar(100), 
+    Location varchar(100), 
+    How_to_apply varchar(1000)); ''')
     return
-
 # Query the database.
 # You should not need to edit anything in this function
 def query_sql(cursor, query):
     cursor.execute(query)
     return cursor
-
 # Add a new job
 def add_new_job(cursor, jobdetails):
     ## Add your code here
     query = "INSERT INTO"
+    type = jobdetails['type']
+    created_at = time.strptime(jobdetails['created_at'], "%a %b %d %H:%M:%S %Z %Y")
+    company = jobdetails['company']
+    location = jobdetails['location']
+    title = jobdetails['title']
+    description = jobdetails['description']
+    how_to_apply = jobdetails['how_to_apply']
+    job_id = jobdetails['id']
+    query = cursor.execute("INSERT INTO Jobs(Type, "
+                              "Title, Description, "
+                              "Job_id, Created_at, "
+                              "Company, Location, "
+                              "How_to_apply" ") "
+               "VALUES(%s,%s,%s,%s,%s,%s,%s,%s)", (type, title, description, job_id,
+                                                   created_at, company, location, how_to_apply))
     return query_sql(cursor, query)
-
 # Check if new job
 def check_if_job_exists(cursor, jobdetails):
     ## Add your code here
     query = "SELECT"
+    job_id = jobdetails['id']
+    query = "SELECT * FROM Jobs WHERE Job_id = \"%s\"" % job_id
     return query_sql(cursor, query)
-
 def delete_job(cursor, jobdetails):
     ## Add your code here
     query = "UPDATE"
+    job_id = jobdetails['id']
+    query = "DELETE FROM Jobs WHERE Job_id = \"%s\"" % job_id
     return query_sql(cursor, query)
-
 # Grab new jobs from a website
 def fetch_new_jobs(arg_dict):
     # Code from https://github.com/RTCedu/CNA336/blob/master/Spring2018/Sql.py
     query = "https://jobs.github.com/positions.json?" + "location=seattle" ## Add arguments here
+    query = "https://jobs.github.com/positions.json?search=SQL&location=Remote"
     jsonpage = 0
     try:
         contents = urllib.request.urlopen(query)
@@ -57,7 +80,6 @@ def fetch_new_jobs(arg_dict):
     except:
         pass
     return jsonpage
-
 # Load a text-based configuration file
 def load_config_file(filename):
     argument_dictionary = 0
@@ -73,23 +95,39 @@ def load_config_file(filename):
         file = open(filename, "w")
         file.write("")
         file.close()
-
     ## Add in information for argument dictionary
     return argument_dictionary
-
 # Main area of the code.
 def jobhunt(cursor, arg_dict):
     # Fetch jobs from website
     jobpage = fetch_new_jobs(arg_dict)
     # print (jobpage)
+    add_or_delete_job(cursor, jobpage)
+def add_or_delete_job(cursor, jobpage):
     ## Add your code here to parse the job page
-
+    for jobdetails in jobpage:
     ## Add in your code here to check if the job already exists in the DB
-
-    ## Add in your code here to notify the user of a new posting
-
-    ## EXTRA CREDIT: Add your code to delete old entries
-
+        check_if_job_exists(cursor, jobdetails)
+        is_job_found = len(cursor.fetchall()) > 0
+        if is_job_found:
+        ## EXTRA CREDIT: Add your code to delete old entries
+            now = datetime.now()
+            job_date = datetime.strptime(jobdetails['created_at'], "%a %b %d %H:%M:%S %Z %Y")
+            if (now - job_date).days > 30:
+                print("Delete job: " +
+                      jobdetails["title"] +
+                      " from " + jobdetails["company"] +
+                      ", Created at: " + jobdetails["created_at"] +
+                      ", JobID: " + jobdetails['id'])
+                delete_job(cursor, jobdetails)
+        else:
+            ## Add in your code here to notify the user of a new posting
+            print("New job is found: " +
+                  jobdetails["title"] +
+                  " from " + jobdetails["company"] +
+                  ", Created at: " + jobdetails["created_at"] +
+                  ", JobID: " + jobdetails['id'])
+            add_new_job(cursor, jobdetails)
 # Setup portion of the program. Take arguments and set up the script
 # You should not need to edit anything here.
 def main():
@@ -98,11 +136,10 @@ def main():
     cursor = conn.cursor()
     create_tables(cursor, "table")
     # Load text file and store arguments into dictionary
-    arg_dict = load_config_file(sys.argv[1])
+    arg_dict = 0
     while(1):
         jobhunt(cursor, arg_dict)
         conn.commit()
-        time.sleep(3600) # Sleep for 1h
-
+        time.sleep(3600)  # Sleep for 1h
 if __name__ == '__main__':
     main()