diff --git a/account.php b/account.php
index 2c043b4..2343a42 100755
--- a/account.php
+++ b/account.php
@@ -19,8 +19,9 @@
   <script src="js/bootstrap.min.js"  type="text/javascript"></script>
 <link href='http://fonts.googleapis.com/css?family=Roboto:400,700,300' rel='stylesheet' type='text/css'>
  <!--alert message-->
-<?php if(@$_GET['w'])
-{echo'<script>alert("'.@$_GET['w'].'");</script>';}
+<?php if (@$_GET['w']) {
+    echo'<script>alert("'.@$_GET['w'].'");</script>';
+}
 ?>
 <!--alert message end-->
 
@@ -37,17 +38,14 @@
  <?php
  include_once 'dbConnection.php';
 session_start();
-  if(!(isset($_SESSION['email']))){
-header("location:index.php");
-
-}
-else
-{
-$name = $_SESSION['name'];
-$email=$_SESSION['email'];
+if (!(isset($_SESSION['email']))) {
+    header("location:index.php");
+} else {
+    $name = $_SESSION['name'];
+    $email=$_SESSION['email'];
 
-include_once 'dbConnection.php';
-echo '<span class="pull-right top title1" ><span class="log1"><span class="glyphicon glyphicon-user" aria-hidden="true"></span>&nbsp;&nbsp;&nbsp;&nbsp;Hello,</span> <a href="account.php?q=1" class="log log1">'.$name.'</a>&nbsp;|&nbsp;<a href="logout.php?q=account.php" class="log"><span class="glyphicon glyphicon-log-out" aria-hidden="true"></span>&nbsp;Signout</button></a></span>';
+    include_once 'dbConnection.php';
+    echo '<span class="pull-right top title1" ><span class="log1"><span class="glyphicon glyphicon-user" aria-hidden="true"></span>&nbsp;&nbsp;&nbsp;&nbsp;Hello,</span> <a href="account.php?q=1" class="log log1">'.$name.'</a>&nbsp;|&nbsp;<a href="logout.php?q=account.php" class="log"><span class="glyphicon glyphicon-log-out" aria-hidden="true"></span>&nbsp;Signout</button></a></span>';
 }?>
 </div>
 </div></div>
@@ -70,9 +68,15 @@
     <!-- Collect the nav links, forms, and other content for toggling -->
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
       <ul class="nav navbar-nav">
-        <li <?php if(@$_GET['q']==1) echo'class="active"'; ?> ><a href="account.php?q=1"><span class="glyphicon glyphicon-home" aria-hidden="true"></span>&nbsp;Home<span class="sr-only">(current)</span></a></li>
-        <li <?php if(@$_GET['q']==2) echo'class="active"'; ?>><a href="account.php?q=2"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>&nbsp;History</a></li>
-		<li <?php if(@$_GET['q']==3) echo'class="active"'; ?>><a href="account.php?q=3"><span class="glyphicon glyphicon-stats" aria-hidden="true"></span>&nbsp;Ranking</a></li></ul>
+        <li <?php if (@$_GET['q']==1) {
+            echo'class="active"';
+        } ?> ><a href="account.php?q=1"><span class="glyphicon glyphicon-home" aria-hidden="true"></span>&nbsp;Home<span class="sr-only">(current)</span></a></li>
+        <li <?php if (@$_GET['q']==2) {
+            echo'class="active"';
+        } ?>><a href="account.php?q=2"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>&nbsp;History</a></li>
+		<li <?php if (@$_GET['q']==3) {
+		    echo'class="active"';
+		} ?>><a href="account.php?q=3"><span class="glyphicon glyphicon-stats" aria-hidden="true"></span>&nbsp;Ranking</a></li></ul>
             <form class="navbar-form navbar-left" role="search">
         <div class="form-group">
           <input type="text" class="form-control" placeholder="Enter tag ">
@@ -87,163 +91,191 @@
 <div class="col-md-12">
 
 <!--home start-->
-<?php if(@$_GET['q']==1) {
-
-$result = mysqli_query($con,"SELECT * FROM quiz ORDER BY date DESC") or die('Error');
-echo  '<div class="panel"><table class="table table-striped title1">
+<?php if (@$_GET['q']==1) {
+    $result = mysqli_query($con, "SELECT * FROM quiz ORDER BY date DESC") or die('Error');
+    echo  '<div class="panel"><table class="table table-striped title1">
 <tr><td><b>S.N.</b></td><td><b>Topic</b></td><td><b>Total question</b></td><td><b>Marks</b></td><td><b>Time limit</b></td><td></td></tr>';
-$c=1;
-while($row = mysqli_fetch_array($result)) {
-	$title = $row['title'];
-	$total = $row['total'];
-	$sahi = $row['sahi'];
-    $time = $row['time'];
-	$eid = $row['eid'];
-$q12=mysqli_query($con,"SELECT score FROM history WHERE eid='$eid' AND email='$email'" )or die('Error98');
-$rowcount=mysqli_num_rows($q12);	
-if($rowcount == 0){
-	echo '<tr><td>'.$c++.'</td><td>'.$title.'</td><td>'.$total.'</td><td>'.$sahi*$total.'</td><td>'.$time.'&nbsp;min</td>
-	<td><b><a href="account.php?q=quiz&step=2&eid='.$eid.'&n=1&t='.$total.'" class="pull-right btn sub1" style="margin:0px;background:#99cc32"><span class="glyphicon glyphicon-new-window" aria-hidden="true"></span>&nbsp;<span class="title1"><b>Start</b></span></a></b></td></tr>';
-}
-else
-{
-echo '<tr style="color:#99cc32"><td>'.$c++.'</td><td>'.$title.'&nbsp;<span title="This quiz is already solve by you" class="glyphicon glyphicon-ok" aria-hidden="true"></span></td><td>'.$total.'</td><td>'.$sahi*$total.'</td><td>'.$time.'&nbsp;min</td>
-	<td><b><a href="update.php?q=quizre&step=25&eid='.$eid.'&n=1&t='.$total.'" class="pull-right btn sub1" style="margin:0px;background:red"><span class="glyphicon glyphicon-repeat" aria-hidden="true"></span>&nbsp;<span class="title1"><b>Restart</b></span></a></b></td></tr>';
-}
-}
-$c=0;
-echo '</table></div>';
-
+    $c=1;
+    while ($row = mysqli_fetch_array($result)) {
+        $title = $row['title'];
+        $total = $row['total'];
+        $sahi = $row['sahi'];
+        $time = $row['time'];
+        $eid = $row['eid'];
+        $q12=mysqli_query($con, "SELECT score FROM history WHERE eid='$eid' AND email='$email'")or die('Error98');
+        $rowcount=mysqli_num_rows($q12);
+        if ($rowcount == 0) {
+            echo '<tr><td>'.$c++.'</td><td>'.$title.'</td><td>'.$total.'</td><td>'.$sahi*$total.'</td><td>'.$time.'&nbsp;min</td>
+	<td><b><a href="account.php?q=quiz&step=2&eid='.$eid.'&n=1&t='.$total.'&time='.$time.'" class="pull-right btn sub1" style="margin:0px;background:#99cc32"><span class="glyphicon glyphicon-new-window" aria-hidden="true"></span>&nbsp;<span class="title1"><b>Start</b></span></a></b></td></tr>';
+        } else {
+            echo '<tr style="color:#99cc32"><td>'.$c++.'</td><td>'.$title.'&nbsp;<span title="This quiz is already solve by you" class="glyphicon glyphicon-ok" aria-hidden="true"></span></td><td>'.$total.'</td><td>'.$sahi*$total.'</td><td>'.$time.'&nbsp;min</td>
+	<td><b><a href="update.php?q=quizre&step=25&eid='.$eid.'&n=1&t='.$total.'&time='.$time.'" class="pull-right btn sub1" style="margin:0px;background:red"><span class="glyphicon glyphicon-repeat" aria-hidden="true"></span>&nbsp;<span class="title1"><b>Restart</b></span></a></b></td></tr>';
+        }
+    }
+    $c=0;
+    echo '</table></div>';
 }?>
-<!--<span id="countdown" class="timer"></span>
+
+
+<button id="demo" class="btn btn-warning timer">countdown begins</button>
+
 <script>
-var seconds = 40;
-    function secondPassed() {
-    var minutes = Math.round((seconds - 30)/60);
-    var remainingSeconds = seconds % 60;
-    if (remainingSeconds < 10) {
-        remainingSeconds = "0" + remainingSeconds; 
-    }
-    document.getElementById('countdown').innerHTML = minutes + ":" +    remainingSeconds;
-    if (seconds == 0) {
-        clearInterval(countdownTimer);
-        document.getElementById('countdown').innerHTML = "Buzz Buzz";
-    } else {    
-        seconds--;
-    }
+  var urlParams = new URLSearchParams(window.location.href);
+    var duration = urlParams.get('time'); // Time set in Minutes
+    var startQuiz = urlParams.get('step');
+    var status = urlParams.get('q');
+    
+   
+    
+    var time = <?php echo (@$_GET['time']);?> //Math.round(duration*60); 
+
+ 
+    var saved_countdown = localStorage.getItem('saved_countdown');
+
+    if(saved_countdown == null) {
+        // Set the time we're counting down to using the time allowed
+        var new_countdown = new Date().getTime() + (time + 2) * 1000;
+
+        time = new_countdown;
+        localStorage.setItem('saved_countdown', new_countdown);
+    } else {
+        time = saved_countdown;
     }
-var countdownTimer = setInterval('secondPassed()', 1000);
-</script>-->
+
+    // Update the count down every 1 second
+    var x = setInterval(() => {
+
+        // Get today's date and time
+        var now = new Date().getTime();
+
+        // Find the distance between now and the allowed time
+        var distance = time - now;
+
+        // Time counter
+        var counter = Math.floor((distance % (1000 * 60)) / 1000);
+
+        // Output the result in an element with id="demo"
+        document.getElementById("demo").innerHTML = counter + " s";
+            
+        // If the count down is over, write some text 
+        if (counter <= 0) {
+            clearInterval(x);
+            localStorage.removeItem('saved_countdown');
+            document.getElementById("demo").innerHTML = "TIME UP";
+            document.getElementById('time_up').submit();
+            
+        }
+    }, 1000);
+
+  
+</script>
 
 <!--home closed-->
 
 <!--quiz start-->
 <?php
-if(@$_GET['q']== 'quiz' && @$_GET['step']== 2) {
-$eid=@$_GET['eid'];
-$sn=@$_GET['n'];
-$total=@$_GET['t'];
-$q=mysqli_query($con,"SELECT * FROM questions WHERE eid='$eid' AND sn='$sn' " );
-echo '<div class="panel" style="margin:5%">';
-while($row=mysqli_fetch_array($q) )
-{
-$qns=$row['qns'];
-$qid=$row['qid'];
-echo '<b>Question &nbsp;'.$sn.'&nbsp;::<br />'.$qns.'</b><br /><br />';
-}
-$q=mysqli_query($con,"SELECT * FROM options WHERE qid='$qid' " );
-echo '<form action="update.php?q=quiz&step=2&eid='.$eid.'&n='.$sn.'&t='.$total.'&qid='.$qid.'" method="POST"  class="form-horizontal">
+if (@$_GET['q']== 'quiz' && @$_GET['step']== 2) {
+    $eid=@$_GET['eid'];
+    $sn=@$_GET['n'];
+    $total=@$_GET['t'];
+    $q=mysqli_query($con, "SELECT * FROM questions WHERE eid='$eid' AND sn='$sn' ");
+    echo '<div class="panel" style="margin:5%">';
+    while ($row=mysqli_fetch_array($q)) {
+        $qns=$row['qns'];
+        $qid=$row['qid'];
+        echo '<b>Question &nbsp;'.$sn.'&nbsp;::<br />'.$qns.'</b><br /><br />';
+    }
+    $q=mysqli_query($con, "SELECT * FROM options WHERE qid='$qid' ");
+    echo '<form action="update.php?q=quiz&step=2&eid='.$eid.'&n='.$sn.'&t='.$total.'&qid='.$qid.'" method="POST"  class="form-horizontal">
 <br />';
 
-while($row=mysqli_fetch_array($q) )
-{
-$option=$row['option'];
-$optionid=$row['optionid'];
-echo'<input type="radio" name="ans" value="'.$optionid.'">'.$option.'<br /><br />';
-}
-echo'<br /><button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-lock" aria-hidden="true"></span>&nbsp;Submit</button></form></div>';
-//header("location:dash.php?q=4&step=2&eid=$id&n=$total");
+    while ($row=mysqli_fetch_array($q)) {
+        $option=$row['option'];
+        $optionid=$row['optionid'];
+        echo'<input type="radio" name="ans" value="'.$optionid.'">'.$option.'<br /><br />';
+    }
+    echo'<br /><button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-lock" aria-hidden="true"></span>&nbsp;Submit</button></form></div>';
+    //header("location:dash.php?q=4&step=2&eid=$id&n=$total");
+
+    //Form for time up
+    echo '<form id="time_up" action="time_up.php?q=quiz&step=2&time_up=1&eid='.$eid.'&n='.$sn.'&t='.$total.'&qid='.$qid.'" method="POST">';
+    //time up from ends here
+
+
+
 }
 //result display
-if(@$_GET['q']== 'result' && @$_GET['eid']) 
-{
-$eid=@$_GET['eid'];
-$q=mysqli_query($con,"SELECT * FROM history WHERE eid='$eid' AND email='$email' " )or die('Error157');
-echo  '<div class="panel">
+if (@$_GET['q']== 'result' && @$_GET['eid']) {
+ echo "<script>document.getElementById('demo').style.display='none';</script>";
+    $eid=@$_GET['eid'];
+    $q=mysqli_query($con, "SELECT * FROM history WHERE eid='$eid' AND email='$email' ")or die('Error157');
+    echo  '<div class="panel">
 <center><h1 class="title" style="color:#660033">Result</h1><center><br /><table class="table table-striped title1" style="font-size:20px;font-weight:1000;">';
 
-while($row=mysqli_fetch_array($q) )
-{
-$s=$row['score'];
-$w=$row['wrong'];
-$r=$row['sahi'];
-$qa=$row['level'];
-echo '<tr style="color:#66CCFF"><td>Total Questions</td><td>'.$qa.'</td></tr>
+    while ($row=mysqli_fetch_array($q)) {
+        $s=$row['score'];
+        $w=$row['wrong'];
+        $r=$row['sahi'];
+        $qa=$row['level'];
+        echo '<tr style="color:#66CCFF"><td>Total Questions</td><td>'.$qa.'</td></tr>
       <tr style="color:#99cc32"><td>right Answer&nbsp;<span class="glyphicon glyphicon-ok-circle" aria-hidden="true"></span></td><td>'.$r.'</td></tr> 
 	  <tr style="color:red"><td>Wrong Answer&nbsp;<span class="glyphicon glyphicon-remove-circle" aria-hidden="true"></span></td><td>'.$w.'</td></tr>
 	  <tr style="color:#66CCFF"><td>Score&nbsp;<span class="glyphicon glyphicon-star" aria-hidden="true"></span></td><td>'.$s.'</td></tr>';
-}
-$q=mysqli_query($con,"SELECT * FROM rank WHERE  email='$email' " )or die('Error157');
-while($row=mysqli_fetch_array($q) )
-{
-$s=$row['score'];
-echo '<tr style="color:#990000"><td>Overall Score&nbsp;<span class="glyphicon glyphicon-stats" aria-hidden="true"></span></td><td>'.$s.'</td></tr>';
-}
-echo '</table></div>';
-
+    }
+    $q=mysqli_query($con, "SELECT * FROM rank WHERE  email='$email' ")or die('Error157');
+    while ($row=mysqli_fetch_array($q)) {
+        $s=$row['score'];
+        echo '<tr style="color:#990000"><td>Overall Score&nbsp;<span class="glyphicon glyphicon-stats" aria-hidden="true"></span></td><td>'.$s.'</td></tr>';
+    }
+    echo '</table></div>';
 }
 ?>
 <!--quiz end-->
 <?php
 //history start
-if(@$_GET['q']== 2) 
-{
-$q=mysqli_query($con,"SELECT * FROM history WHERE email='$email' ORDER BY date DESC " )or die('Error197');
-echo  '<div class="panel title">
+if (@$_GET['q']== 2) {
+    $q=mysqli_query($con, "SELECT * FROM history WHERE email='$email' ORDER BY date DESC ")or die('Error197');
+    echo  '<div class="panel title">
 <table class="table table-striped title1" >
 <tr style="color:red"><td><b>S.N.</b></td><td><b>Quiz</b></td><td><b>Question Solved</b></td><td><b>Right</b></td><td><b>Wrong<b></td><td><b>Score</b></td>';
-$c=0;
-while($row=mysqli_fetch_array($q) )
-{
-$eid=$row['eid'];
-$s=$row['score'];
-$w=$row['wrong'];
-$r=$row['sahi'];
-$qa=$row['level'];
-$q23=mysqli_query($con,"SELECT title FROM quiz WHERE  eid='$eid' " )or die('Error208');
-while($row=mysqli_fetch_array($q23) )
-{
-$title=$row['title'];
-}
-$c++;
-echo '<tr><td>'.$c.'</td><td>'.$title.'</td><td>'.$qa.'</td><td>'.$r.'</td><td>'.$w.'</td><td>'.$s.'</td></tr>';
-}
-echo'</table></div>';
+    $c=0;
+    while ($row=mysqli_fetch_array($q)) {
+        $eid=$row['eid'];
+        $s=$row['score'];
+        $w=$row['wrong'];
+        $r=$row['sahi'];
+        $qa=$row['level'];
+        $q23=mysqli_query($con, "SELECT title FROM quiz WHERE  eid='$eid' ")or die('Error208');
+        while ($row=mysqli_fetch_array($q23)) {
+            $title=$row['title'];
+        }
+        $c++;
+        echo '<tr><td>'.$c.'</td><td>'.$title.'</td><td>'.$qa.'</td><td>'.$r.'</td><td>'.$w.'</td><td>'.$s.'</td></tr>';
+    }
+    echo'</table></div>';
 }
 
 //ranking start
-if(@$_GET['q']== 3) 
-{
-$q=mysqli_query($con,"SELECT * FROM rank  ORDER BY score DESC " )or die('Error223');
-echo  '<div class="panel title">
+if (@$_GET['q']== 3) {
+    $q=mysqli_query($con, "SELECT * FROM rank  ORDER BY score DESC ")or die('Error223');
+    echo  '<div class="panel title">
 <table class="table table-striped title1" >
 <tr style="color:red"><td><b>Rank</b></td><td><b>Name</b></td><td><b>Gender</b></td><td><b>College</b></td><td><b>Score</b></td></tr>';
-$c=0;
-while($row=mysqli_fetch_array($q) )
-{
-$e=$row['email'];
-$s=$row['score'];
-$q12=mysqli_query($con,"SELECT * FROM user WHERE email='$e' " )or die('Error231');
-while($row=mysqli_fetch_array($q12) )
-{
-$name=$row['name'];
-$gender=$row['gender'];
-$college=$row['college'];
-}
-$c++;
-echo '<tr><td style="color:#99cc32"><b>'.$c.'</b></td><td>'.$name.'</td><td>'.$gender.'</td><td>'.$college.'</td><td>'.$s.'</td><td>';
+    $c=0;
+    while ($row=mysqli_fetch_array($q)) {
+        $e=$row['email'];
+        $s=$row['score'];
+        $q12=mysqli_query($con, "SELECT * FROM user WHERE email='$e' ")or die('Error231');
+        while ($row=mysqli_fetch_array($q12)) {
+            $name=$row['name'];
+            $gender=$row['gender'];
+            $college=$row['college'];
+        }
+        $c++;
+        echo '<tr><td style="color:#99cc32"><b>'.$c.'</b></td><td>'.$name.'</td><td>'.$gender.'</td><td>'.$college.'</td><td>'.$s.'</td><td>';
+    }
+    echo '</table></div>';
 }
-echo '</table></div>';}
 ?>
 
 
diff --git a/dbConnection.php b/dbConnection.php
index 544e5e0..0f5cd21 100755
--- a/dbConnection.php
+++ b/dbConnection.php
@@ -1,5 +1,5 @@
 <?php
 
-$con= new mysqli('localhost','root','root','vinnovateit')or die("Could not connect to mysql".mysqli_error($con));
+$con= new mysqli('localhost','root','','recruit')or die("Could not connect to mysql".mysqli_error($con));
 
 ?>
\ No newline at end of file
diff --git a/time_up.php b/time_up.php
new file mode 100644
index 0000000..2d0ddbe
--- /dev/null
+++ b/time_up.php
@@ -0,0 +1,38 @@
+<?php
+
+include_once 'dbConnection.php';
+session_start();
+$email=$_SESSION['email'];
+
+// If Time is Up
+if (@$_GET['q']== 'quiz' && @$_GET['step']== 2 && @$_GET['time_up']== 1) {
+  echo "Good Morning";
+    $eid=@$_GET['eid'];
+    $sn=@$_GET['n'];
+
+    // Check if user has submitted any question
+
+    $check_email = mysqli_query($con, "SELECT * FROM history WHERE eid='$eid' AND email='$email' ");
+    if (mysqli_num_rows($check_email) > 0) { // User has submitted something
+        $q=mysqli_query($con, "SELECT * FROM history WHERE eid='$eid' AND email='$email' ")or die('Error115');
+
+        while ($row=mysqli_fetch_array($check_email)) {
+            $s=$row['score'];
+            $r=$row['sahi'];
+        }
+        $r++;
+        $s=$s+$sahi; // Total Score
+        $check_email=mysqli_query($con, "UPDATE `history` SET `score`=$s,`level`=$sn,`sahi`=$r, date= NOW()  WHERE  email = '$email' AND eid = '$eid'")or die('Error124');
+
+        // Show results
+        header("location:account.php?q=result&eid=$eid");
+    }
+
+    // If Time elapses on the first page (user has not submitted any question)
+    $check_email=mysqli_query($con, "INSERT INTO history VALUES('$email','$eid' ,'0','0','0','0',NOW())")or die('Error');
+    //Show results
+    header("location:account.php?q=result&eid=$eid");
+}
+
+
+?>
\ No newline at end of file
diff --git a/update.php b/update.php
index 9cac8f3..44ddff7 100755
--- a/update.php
+++ b/update.php
@@ -1,224 +1,210 @@
 <?php
+
 include_once 'dbConnection.php';
 session_start();
 $email=$_SESSION['email'];
 //delete feedback
-if(isset($_SESSION['key'])){
-if(@$_GET['fdid'] && $_SESSION['key']=='vinitshahdeo') {
-$id=@$_GET['fdid'];
-$result = mysqli_query($con,"DELETE FROM feedback WHERE id='$id' ") or die('Error');
-header("location:dash.php?q=3");
-}
+if (isset($_SESSION['key'])) {
+    if (@$_GET['fdid'] && $_SESSION['key']=='vinitshahdeo') {
+        $id=@$_GET['fdid'];
+        $result = mysqli_query($con, "DELETE FROM feedback WHERE id='$id' ") or die('Error');
+        header("location:dash.php?q=3");
+    }
 }
 
 //delete user
-if(isset($_SESSION['key'])){
-if(@$_GET['demail'] && $_SESSION['key']=='vinitshahdeo') {
-$demail=@$_GET['demail'];
-$r1 = mysqli_query($con,"DELETE FROM rank WHERE email='$demail' ") or die('Error');
-$r2 = mysqli_query($con,"DELETE FROM history WHERE email='$demail' ") or die('Error');
-$result = mysqli_query($con,"DELETE FROM user WHERE email='$demail' ") or die('Error');
-header("location:dash.php?q=1");
-}
+if (isset($_SESSION['key'])) {
+    if (@$_GET['demail'] && $_SESSION['key']=='vinitshahdeo') {
+        $demail=@$_GET['demail'];
+        $r1 = mysqli_query($con, "DELETE FROM rank WHERE email='$demail' ") or die('Error');
+        $r2 = mysqli_query($con, "DELETE FROM history WHERE email='$demail' ") or die('Error');
+        $result = mysqli_query($con, "DELETE FROM user WHERE email='$demail' ") or die('Error');
+        header("location:dash.php?q=1");
+    }
 }
 //remove quiz
-if(isset($_SESSION['key'])){
-if(@$_GET['q']== 'rmquiz' && $_SESSION['key']=='vinitshahdeo') {
-$eid=@$_GET['eid'];
-$result = mysqli_query($con,"SELECT * FROM questions WHERE eid='$eid' ") or die('Error');
-while($row = mysqli_fetch_array($result)) {
-	$qid = $row['qid'];
-$r1 = mysqli_query($con,"DELETE FROM options WHERE qid='$qid'") or die('Error');
-$r2 = mysqli_query($con,"DELETE FROM answer WHERE qid='$qid' ") or die('Error');
-}
-$r3 = mysqli_query($con,"DELETE FROM questions WHERE eid='$eid' ") or die('Error');
-$r4 = mysqli_query($con,"DELETE FROM quiz WHERE eid='$eid' ") or die('Error');
-$r4 = mysqli_query($con,"DELETE FROM history WHERE eid='$eid' ") or die('Error');
+if (isset($_SESSION['key'])) {
+    if (@$_GET['q']== 'rmquiz' && $_SESSION['key']=='vinitshahdeo') {
+        $eid=@$_GET['eid'];
+        $result = mysqli_query($con, "SELECT * FROM questions WHERE eid='$eid' ") or die('Error');
+        while ($row = mysqli_fetch_array($result)) {
+            $qid = $row['qid'];
+            $r1 = mysqli_query($con, "DELETE FROM options WHERE qid='$qid'") or die('Error');
+            $r2 = mysqli_query($con, "DELETE FROM answer WHERE qid='$qid' ") or die('Error');
+        }
+        $r3 = mysqli_query($con, "DELETE FROM questions WHERE eid='$eid' ") or die('Error');
+        $r4 = mysqli_query($con, "DELETE FROM quiz WHERE eid='$eid' ") or die('Error');
+        $r4 = mysqli_query($con, "DELETE FROM history WHERE eid='$eid' ") or die('Error');
 
-header("location:dash.php?q=5");
-}
+        header("location:dash.php?q=5");
+    }
 }
 
 //add quiz
-if(isset($_SESSION['key'])){
-if(@$_GET['q']== 'addquiz' && $_SESSION['key']=='vinitshahdeo') {
-$name = $_POST['name'];
-$name= ucwords(strtolower($name));
-$total = $_POST['total'];
-$sahi = $_POST['right'];
-$wrong = $_POST['wrong'];
-$time = $_POST['time'];
-$tag = $_POST['tag'];
-$desc = $_POST['desc'];
-$id=uniqid();
-$q3=mysqli_query($con,"INSERT INTO quiz VALUES  ('$id','$name' , '$sahi' , '$wrong','$total','$time' ,'$desc','$tag', NOW())");
-
-header("location:dash.php?q=4&step=2&eid=$id&n=$total");
-}
+if (isset($_SESSION['key'])) {
+    if (@$_GET['q']== 'addquiz' && $_SESSION['key']=='vinitshahdeo') {
+        $name = $_POST['name'];
+        $name= ucwords(strtolower($name));
+        $total = $_POST['total'];
+        $sahi = $_POST['right'];
+        $wrong = $_POST['wrong'];
+        $time = $_POST['time'];
+        $tag = $_POST['tag'];
+        $desc = $_POST['desc'];
+        $id=uniqid();
+        $q3=mysqli_query($con, "INSERT INTO quiz VALUES  ('$id','$name' , '$sahi' , '$wrong','$total','$time' ,'$desc','$tag', NOW())");
+
+        header("location:dash.php?q=4&step=2&eid=$id&n=$total");
+    }
 }
 
 //add question
-if(isset($_SESSION['key'])){
-if(@$_GET['q']== 'addqns' && $_SESSION['key']=='vinitshahdeo') {
-$n=@$_GET['n'];
-$eid=@$_GET['eid'];
-$ch=@$_GET['ch'];
-
-for($i=1;$i<=$n;$i++)
- {
- $qid=uniqid();
- $qns=$_POST['qns'.$i];
-$q3=mysqli_query($con,"INSERT INTO questions VALUES  ('$eid','$qid','$qns' , '$ch' , '$i')");
-  $oaid=uniqid();
-  $obid=uniqid();
-$ocid=uniqid();
-$odid=uniqid();
-$a=$_POST[$i.'1'];
-$b=$_POST[$i.'2'];
-$c=$_POST[$i.'3'];
-$d=$_POST[$i.'4'];
-$qa=mysqli_query($con,"INSERT INTO options VALUES  ('$qid','$a','$oaid')") or die('Error61');
-$qb=mysqli_query($con,"INSERT INTO options VALUES  ('$qid','$b','$obid')") or die('Error62');
-$qc=mysqli_query($con,"INSERT INTO options VALUES  ('$qid','$c','$ocid')") or die('Error63');
-$qd=mysqli_query($con,"INSERT INTO options VALUES  ('$qid','$d','$odid')") or die('Error64');
-$e=$_POST['ans'.$i];
-switch($e)
-{
-case 'a':
-$ansid=$oaid;
-break;
-case 'b':
-$ansid=$obid;
-break;
-case 'c':
-$ansid=$ocid;
-break;
-case 'd':
-$ansid=$odid;
-break;
-default:
-$ansid=$oaid;
-}
+if (isset($_SESSION['key'])) {
+    if (@$_GET['q']== 'addqns' && $_SESSION['key']=='vinitshahdeo') {
+        $n=@$_GET['n'];
+        $eid=@$_GET['eid'];
+        $ch=@$_GET['ch'];
 
+        for ($i=1;$i<=$n;$i++) {
+            $qid=uniqid();
+            $qns=$_POST['qns'.$i];
+            $q3=mysqli_query($con, "INSERT INTO questions VALUES  ('$eid','$qid','$qns' , '$ch' , '$i')");
+            $oaid=uniqid();
+            $obid=uniqid();
+            $ocid=uniqid();
+            $odid=uniqid();
+            $a=$_POST[$i.'1'];
+            $b=$_POST[$i.'2'];
+            $c=$_POST[$i.'3'];
+            $d=$_POST[$i.'4'];
+            $qa=mysqli_query($con, "INSERT INTO options VALUES  ('$qid','$a','$oaid')") or die('Error61');
+            $qb=mysqli_query($con, "INSERT INTO options VALUES  ('$qid','$b','$obid')") or die('Error62');
+            $qc=mysqli_query($con, "INSERT INTO options VALUES  ('$qid','$c','$ocid')") or die('Error63');
+            $qd=mysqli_query($con, "INSERT INTO options VALUES  ('$qid','$d','$odid')") or die('Error64');
+            $e=$_POST['ans'.$i];
+            switch($e) {
+                case 'a':
+                    $ansid=$oaid;
+                    break;
+                case 'b':
+                    $ansid=$obid;
+                    break;
+                case 'c':
+                    $ansid=$ocid;
+                    break;
+                case 'd':
+                    $ansid=$odid;
+                    break;
+                default:
+                    $ansid=$oaid;
+            }
 
-$qans=mysqli_query($con,"INSERT INTO answer VALUES  ('$qid','$ansid')");
 
- }
-header("location:dash.php?q=0");
-}
+            $qans=mysqli_query($con, "INSERT INTO answer VALUES  ('$qid','$ansid')");
+        }
+        header("location:dash.php?q=0");
+    }
 }
 
 //quiz start
-if(@$_GET['q']== 'quiz' && @$_GET['step']== 2) {
-$eid=@$_GET['eid'];
-$sn=@$_GET['n'];
-$total=@$_GET['t'];
-$ans=$_POST['ans'];
-$qid=@$_GET['qid'];
-$q=mysqli_query($con,"SELECT * FROM answer WHERE qid='$qid' " );
-while($row=mysqli_fetch_array($q) )
-{
-$ansid=$row['ansid'];
-}
-if($ans == $ansid)
-{
-$q=mysqli_query($con,"SELECT * FROM quiz WHERE eid='$eid' " );
-while($row=mysqli_fetch_array($q) )
-{
-$sahi=$row['sahi'];
-}
-if($sn == 1)
-{
-$q=mysqli_query($con,"INSERT INTO history VALUES('$email','$eid' ,'0','0','0','0',NOW())")or die('Error');
-}
-$q=mysqli_query($con,"SELECT * FROM history WHERE eid='$eid' AND email='$email' ")or die('Error115');
+if (@$_GET['q']== 'quiz' && @$_GET['step']== 2) {
+    $eid=@$_GET['eid'];
+    $sn=@$_GET['n'];
+    $total=@$_GET['t'];
+    $ans=$_POST['ans'];
+    $qid=@$_GET['qid'];
+    $time=@$_GET['time'];
+    $q=mysqli_query($con, "SELECT * FROM answer WHERE qid='$qid' ");
+    while ($row=mysqli_fetch_array($q)) {
+        $ansid=$row['ansid'];
+    }
+    if ($ans == $ansid) {
+        $q=mysqli_query($con, "SELECT * FROM quiz WHERE eid='$eid' ");
+        while ($row=mysqli_fetch_array($q)) {
+            $sahi=$row['sahi']; // Score for each mark
+        }
+        if ($sn == 1) {
+            $q=mysqli_query($con, "INSERT INTO history VALUES('$email','$eid' ,'0','0','0','0',NOW())")or die('Error');
+        }
+        $q=mysqli_query($con, "SELECT * FROM history WHERE eid='$eid' AND email='$email' ")or die('Error115');
 
-while($row=mysqli_fetch_array($q) )
-{
-$s=$row['score'];
-$r=$row['sahi'];
-}
-$r++;
-$s=$s+$sahi;
-$q=mysqli_query($con,"UPDATE `history` SET `score`=$s,`level`=$sn,`sahi`=$r, date= NOW()  WHERE  email = '$email' AND eid = '$eid'")or die('Error124');
+        while ($row=mysqli_fetch_array($q)) {
+            $s=$row['score'];
+            $r=$row['sahi'];
+        }
+        $r++;
+        $s=$s+$sahi; // Total Score
+        $q=mysqli_query($con, "UPDATE `history` SET `score`=$s,`level`=$sn,`sahi`=$r, date= NOW()  WHERE  email = '$email' AND eid = '$eid'")or die('Error124');
+    }
+    
+    // If Wrong Answer 
+    else {
+        $q=mysqli_query($con, "SELECT * FROM quiz WHERE eid='$eid' ")or die('Error129');
 
-}
-else
-{
-$q=mysqli_query($con,"SELECT * FROM quiz WHERE eid='$eid' " )or die('Error129');
+        while ($row=mysqli_fetch_array($q)) {
+            $wrong=$row['wrong'];
+        }
+        if ($sn == 1) {
+            $q=mysqli_query($con, "INSERT INTO history VALUES('$email','$eid' ,'0','0','0','0',NOW() )")or die('Error137');
+        }
+        $q=mysqli_query($con, "SELECT * FROM history WHERE eid='$eid' AND email='$email' ")or die('Error139');
+        while ($row=mysqli_fetch_array($q)) {
+            $s=$row['score'];
+            $w=$row['wrong'];
+        }
+        $w++;
+        $s=$s-$wrong;
+        $q=mysqli_query($con, "UPDATE `history` SET `score`=$s,`level`=$sn,`wrong`=$w, date=NOW() WHERE  email = '$email' AND eid = '$eid'")or die('Error147');
+    }
 
-while($row=mysqli_fetch_array($q) )
-{
-$wrong=$row['wrong'];
-}
-if($sn == 1)
-{
-$q=mysqli_query($con,"INSERT INTO history VALUES('$email','$eid' ,'0','0','0','0',NOW() )")or die('Error137');
-}
-$q=mysqli_query($con,"SELECT * FROM history WHERE eid='$eid' AND email='$email' " )or die('Error139');
-while($row=mysqli_fetch_array($q) )
-{
-$s=$row['score'];
-$w=$row['wrong'];
-}
-$w++;
-$s=$s-$wrong;
-$q=mysqli_query($con,"UPDATE `history` SET `score`=$s,`level`=$sn,`wrong`=$w, date=NOW() WHERE  email = '$email' AND eid = '$eid'")or die('Error147');
-}
-if($sn != $total)
-{
-$sn++;
-header("location:account.php?q=quiz&step=2&eid=$eid&n=$sn&t=$total")or die('Error152');
-}
-else if( $_SESSION['key']!='vinitshahdeo')
-{
-$q=mysqli_query($con,"SELECT score FROM history WHERE eid='$eid' AND email='$email'" )or die('Error156');
-while($row=mysqli_fetch_array($q) )
-{
-$s=$row['score'];
-}
-$q=mysqli_query($con,"SELECT * FROM rank WHERE email='$email'" )or die('Error161');
-$rowcount=mysqli_num_rows($q);
-if($rowcount == 0)
-{
-$q2=mysqli_query($con,"INSERT INTO rank VALUES('$email','$s',NOW())")or die('Error165');
-}
-else
-{
-while($row=mysqli_fetch_array($q) )
-{
-$sun=$row['score'];
-}
-$sun=$s+$sun;
-$q=mysqli_query($con,"UPDATE `rank` SET `score`=$sun ,time=NOW() WHERE email= '$email'")or die('Error174');
-}
-header("location:account.php?q=result&eid=$eid");
-}
-else
-{
-header("location:account.php?q=result&eid=$eid");
-}
+   
+    if ($sn != $total) {
+        $sn++;
+        header("location:account.php?q=quiz&step=2&eid=$eid&n=$sn&t=$total")or die('Error152');
+    } elseif ($_SESSION['key']!='vinitshahdeo') {
+        $q=mysqli_query($con, "SELECT score FROM history WHERE eid='$eid' AND email='$email'")or die('Error156');
+        while ($row=mysqli_fetch_array($q)) {
+            $s=$row['score'];
+        }
+        $q=mysqli_query($con, "SELECT * FROM rank WHERE email='$email'")or die('Error161');
+        $rowcount=mysqli_num_rows($q);
+        if ($rowcount == 0) {
+            $q2=mysqli_query($con, "INSERT INTO rank VALUES('$email','$s',NOW())")or die('Error165');
+        } else {
+            while ($row=mysqli_fetch_array($q)) {
+                $sun=$row['score'];
+            }
+            $sun=$s+$sun;
+            $q=mysqli_query($con, "UPDATE `rank` SET `score`=$sun ,time=NOW() WHERE email= '$email'")or die('Error174');
+        }
+        header("location:account.php?q=result&eid=$eid&time=$time");
+    } else {
+        header("location:account.php?q=result&eid=$eid&time=$time");
+    }
 }
 
 //restart quiz
-if(@$_GET['q']== 'quizre' && @$_GET['step']== 25 ) {
-$eid=@$_GET['eid'];
-$n=@$_GET['n'];
-$t=@$_GET['t'];
-$q=mysqli_query($con,"SELECT score FROM history WHERE eid='$eid' AND email='$email'" )or die('Error156');
-while($row=mysqli_fetch_array($q) )
-{
-$s=$row['score'];
-}
-$q=mysqli_query($con,"DELETE FROM `history` WHERE eid='$eid' AND email='$email' " )or die('Error184');
-$q=mysqli_query($con,"SELECT * FROM rank WHERE email='$email'" )or die('Error161');
-while($row=mysqli_fetch_array($q) )
-{
-$sun=$row['score'];
-}
-$sun=$sun-$s;
-$q=mysqli_query($con,"UPDATE `rank` SET `score`=$sun ,time=NOW() WHERE email= '$email'")or die('Error174');
-header("location:account.php?q=quiz&step=2&eid=$eid&n=1&t=$t");
+if (@$_GET['q']== 'quizre' && @$_GET['step']== 25) {
+    $eid=@$_GET['eid'];
+    $n=@$_GET['n'];
+    $t=@$_GET['t'];
+    $time=@$_GET['time'];
+    $q=mysqli_query($con, "SELECT score FROM history WHERE eid='$eid' AND email='$email'")or die('Error156');
+    while ($row=mysqli_fetch_array($q)) {
+        $s=$row['score'];
+    }
+    $q=mysqli_query($con, "DELETE FROM `history` WHERE eid='$eid' AND email='$email' ")or die('Error184');
+    $q=mysqli_query($con, "SELECT * FROM rank WHERE email='$email'")or die('Error161');
+    while ($row=mysqli_fetch_array($q)) {
+        $sun=$row['score'];
+    }
+    $sun=$sun-$s;
+    $q=mysqli_query($con, "UPDATE `rank` SET `score`=$sun ,time=NOW() WHERE email= '$email'")or die('Error174');
+    header("location:account.php?q=quiz&step=2&eid=$eid&n=1&t=$t&time=$time");
 }
 
-?>
+
+
+
+
+