diff --git a/FusionIIIT/applications/online_cms/models.py b/FusionIIIT/applications/online_cms/models.py
index 53a3f315c..74f2a93bd 100644
--- a/FusionIIIT/applications/online_cms/models.py
+++ b/FusionIIIT/applications/online_cms/models.py
@@ -1,33 +1,32 @@
 from django.db import models
 #import models used from academic procedure and academic information  modules and globals
-from applications.academic_information.models import Course, Student, Curriculum
-from applications.academic_procedures.models import Register
+from applications.academic_information.models import Student, Curriculum
+from applications.programme_curriculum.models import Course as Courses, CourseInstructor
 from applications.globals.models import ExtraInfo
 
 #the modules for containing course content
 class Modules(models.Model):
     module_name = models.CharField(max_length=50)
-    course_id = models.ForeignKey(Course, on_delete=models.CASCADE, default = 405)
+    course_id = models.ForeignKey(Courses, on_delete=models.CASCADE)
 
     def __str__(self):
         return self.module_name
 
 #the documents in the course (slides , ppt) added by the faculty  and can be downloaded by the students
 class CourseDocuments(models.Model):
-    course_id = models.ForeignKey(Course, on_delete=models.CASCADE)
+    course_id = models.ForeignKey(Courses, on_delete=models.CASCADE)
     module_id = models.ForeignKey(Modules, on_delete=models.CASCADE, default = 1)
     upload_time = models.DateTimeField(auto_now=True)
     description = models.CharField(max_length=100)
     document_name = models.CharField(max_length=40)
-    document_url = models.CharField(max_length=500, null=True,blank=True)
-    # media = models.FileField(upload_to=content_file_name, null=True, blank=True)
+    document_url = models.CharField(max_length=100, null=True)
 
     def __str__(self):
         return '{} - {}'.format(self.course_id, self.document_name)
     
 #the attendance files added by the faculty and can be downloaded by the students
 class AttendanceFiles(models.Model):
-    course_id = models.ForeignKey(Course, on_delete=models.CASCADE)
+    course_id = models.ForeignKey(Courses, on_delete=models.CASCADE)
     upload_time = models.DateTimeField(auto_now=True)
     file_name = models.CharField(max_length=40)
     file_url = models.CharField(max_length=100, null=True)
@@ -37,7 +36,7 @@ def __str__(self):
 
 #videos added by the faculty and can be downloaded by students
 class CourseVideo(models.Model):
-    course_id = models.ForeignKey(Course, on_delete=models.CASCADE)
+    course_id = models.ForeignKey(Courses, on_delete=models.CASCADE)
     upload_time = models.DateTimeField(auto_now=True)
     description = models.CharField(max_length=100)
     video_name = models.CharField(max_length=40)
@@ -48,7 +47,7 @@ def __str__(self):
 
 #For storing the questions topic wise
 class Topics(models.Model):
-    course_id = models.ForeignKey(Course, on_delete=models.CASCADE)
+    course_id = models.ForeignKey(Courses, on_delete=models.CASCADE)
     topic_name = models.TextField(max_length=200)
 
     def __str__(self):
@@ -57,7 +56,7 @@ def __str__(self):
 #details of a question bank of which course it is 
 class QuestionBank(models.Model):
     instructor_id = models.ForeignKey(ExtraInfo, on_delete=models.CASCADE)
-    course_id = models.ForeignKey(Course, on_delete=models.CASCADE)
+    course_id = models.ForeignKey(Courses, on_delete=models.CASCADE)
     name = models.CharField(max_length=100)  #name of question bank
 
     def __str__(self):
@@ -85,7 +84,7 @@ class Question(models.Model):
 
  #details of quiz are stored
 class Quiz(models.Model):
-    course_id = models.ForeignKey(Course, on_delete=models.CASCADE)
+    course_id = models.ForeignKey(Courses, on_delete=models.CASCADE)
     quiz_name = models.CharField(max_length=20)
     end_time = models.DateTimeField()
     start_time = models.DateTimeField()
@@ -115,7 +114,7 @@ def __str__(self):
 
 #the details of practice quiz (objective assignment)---- under development
 class Practice(models.Model):
-    course_id = models.ForeignKey(Course, on_delete=models.CASCADE)
+    course_id = models.ForeignKey(Courses, on_delete=models.CASCADE)
     prac_quiz_name = models.CharField(max_length=20)
     negative_marks = models.FloatField(default=0)
     number_of_question = models.IntegerField(default=0)
@@ -160,7 +159,7 @@ def __str__(self):
 
 #details of the assignment uploaded by the faculty
 class Assignment(models.Model):
-    course_id = models.ForeignKey(Course, on_delete=models.CASCADE)
+    course_id = models.ForeignKey(Courses, on_delete=models.CASCADE)
     upload_time = models.DateTimeField(auto_now=True)
     submit_date = models.DateTimeField()
     assignment_name = models.CharField(max_length=100)
@@ -200,7 +199,7 @@ def __str__(self):
 
 #to store the comment of student and lecturer
 class Forum(models.Model):
-    course_id = models.ForeignKey(Course, on_delete=models.CASCADE)
+    course_id = models.ForeignKey(Courses, on_delete=models.CASCADE)
     commenter_id = models.ForeignKey(ExtraInfo, on_delete=models.CASCADE)
     comment_time = models.DateTimeField(auto_now=True)
     comment = models.TextField(max_length=2000)
@@ -224,7 +223,7 @@ def __str__(self):
         return '{} - {} - {}'.format(self.pk, self.forum_ques, self.forum_reply)
     
 class GradingScheme(models.Model):
-    course_id = models.ForeignKey(Course, on_delete=models.CASCADE)
+    course_id = models.ForeignKey(Courses, on_delete=models.CASCADE)
     # quiz = models.DecimalField(max_digits=10, decimal_places=2,default=0)
     # assignment = models.DecimalField(max_digits=10, decimal_places=2,default=0)
     # midsem = models.DecimalField(max_digits=10, decimal_places=2,default=0)
@@ -238,7 +237,7 @@ def __str__(self):
                 self.pk, self.course_id)
     
 class GradingScheme_grades(models.Model):
-    course_id = models.ForeignKey(Course, on_delete=models.CASCADE)
+    course_id = models.ForeignKey(Courses, on_delete=models.CASCADE)
     O_Lower = models.DecimalField(max_digits=10, decimal_places=2, default=0)
     O_Upper = models.DecimalField(max_digits=10, decimal_places=2, default=0)
     A_plus_Lower = models.DecimalField(max_digits=10, decimal_places=2, default=0)
@@ -264,7 +263,7 @@ def __str__(self):
         return '{} - {}'.format(self.pk, self.course_id)
 
 class Student_grades(models.Model):
-    course_id = models.ForeignKey(Course, on_delete=models.CASCADE)
+    course_id = models.ForeignKey(Courses, on_delete=models.CASCADE)
     semester = models.IntegerField(default=1)
     year = models.IntegerField(default=2016)
     roll_no = models.TextField(max_length=2000)
@@ -273,4 +272,16 @@ class Student_grades(models.Model):
     batch = models.IntegerField(default=2021)
  
     def __str__(self):
-        return '{} - {}'.format(self.pk, self.course_id)
\ No newline at end of file
+        return '{} - {}'.format(self.pk, self.course_id)
+
+class Attendance(models.Model):
+    student_id = models.ForeignKey(Student,on_delete=models.CASCADE)
+#    course_id = models.ForeignKey(Course)
+#    attend = models.CharField(max_length=6, choices=Constants.ATTEND_CHOICES)
+    instructor_id = models.ForeignKey(CourseInstructor, on_delete=models.CASCADE)
+#    curriculum_id = models.ForeignKey(Curriculum, on_delete=models.CASCADE)
+    date = models.DateField()
+    present = models.BooleanField(default=False)
+ 
+    def __str__(self):
+        return self.course_id
\ No newline at end of file
diff --git a/FusionIIIT/applications/online_cms/urls.py b/FusionIIIT/applications/online_cms/urls.py
index 1a5e35a50..f5d3996be 100644
--- a/FusionIIIT/applications/online_cms/urls.py
+++ b/FusionIIIT/applications/online_cms/urls.py
@@ -7,32 +7,32 @@
 urlpatterns = [
     
     url(r'^$', views.viewcourses, name='viewcourses'),
-    url(r'^(?P<course_code>[A-Z0-9]+)/$', views.course, name='course'),
+    url(r'^(?P<course_code>[A-Z0-9]+)/(?P<version>[\d.]+)/$', views.course, name='course'),
     # url(r'^(?P<course_code>[A-Z0-9]+)/edit_marks$', views.edit_marks, name='edit_marks'),
-    url(r'^(?P<course_code>[A-Z0-9]+)/get_exam_data$', views.get_exam_data, name='get_exam_data'),
-    url(r'^(?P<course_code>[A-Z0-9]+)/forum$', views.forum,
+    url(r'^(?P<course_code>[A-Z0-9]+)/(?P<version>[\d.]+)/get_exam_data$', views.get_exam_data, name='get_exam_data'),
+    url(r'^(?P<course_code>[A-Z0-9]+)/(?P<version>[\d.]+)/forum$', views.forum,
         name='forum'),
-    url(r'^(?P<course_code>[A-Z0-9]+)/ajax_reply$', views.ajax_reply,
+    url(r'^(?P<course_code>[A-Z0-9]+)/(?P<version>[\d.]+)/ajax_reply$', views.ajax_reply,
         name='ajax_reply'),
-    url(r'^(?P<course_code>[A-Z0-9]+)/ajax_new$', views.ajax_new,
+    url(r'^(?P<course_code>[A-Z0-9]+)/(?P<version>[\d.]+)/ajax_new$', views.ajax_new,
         name='ajax_new'),
-    url(r'^(?P<course_code>[A-Z0-9]+)/ajax_remove$', views.ajax_remove,
+    url(r'^(?P<course_code>[A-Z0-9]+)/(?P<version>[\d.]+)/ajax_remove$', views.ajax_remove,
         name='ajax_remove'),
-    url(r'^(?P<course_code>[A-Z0-9]+)/upload_assignment$', views.upload_assignment,
+    url(r'^(?P<course_code>[A-Z0-9]+)/(?P<version>[\d.]+)/upload_assignment$', views.upload_assignment,
         name='upload_assignment'),
-    url(r'^(?P<course_code>[A-Z0-9]+)/add_modules$', views.add_modules,
+    url(r'^(?P<course_code>[A-Z0-9]+)/(?P<version>[\d.]+)/add_modules$', views.add_modules,
         name='add_modules'),
-    url(r'^(?P<course_code>[A-Z0-9]+)/add_documents$', views.add_document,
+    url(r'^(?P<course_code>[A-Z0-9]+)/(?P<version>[\d.]+)/add_documents$', views.add_document,
         name='add_document'),
-    url(r'^(?P<course_code>[A-Z0-9]+)/add_assignment$',
+    url(r'^(?P<course_code>[A-Z0-9]+)/(?P<version>[\d.]+)/add_assignment$',
         views.add_assignment, name='add_assignment'),
     # url(r'^(?P<course_code>[A-Z0-9]+)/add_video$', views.add_videos,
     #     name='add_videos'),
-    url(r'^(?P<course_code>[A-Z0-9]+)/delete/$', views.delete,
+    url(r'^(?P<course_code>[A-Z0-9]+)/(?P<version>[\d.]+)/delete/$', views.delete,
         name='delete'),
-    url(r'^(?P<course_code>[A-Z0-9]+)/ajax_assess$', views.ajax_assess,
+    url(r'^(?P<course_code>[A-Z0-9]+)/(?P<version>[\d.]+)/ajax_assess$', views.ajax_assess,
         name='ajax_assess'),
-    url(r'^(?P<course_code>[A-Z0-9]+)/ajax_feedback$', views.ajax_feedback,
+    url(r'^(?P<course_code>[A-Z0-9]+)/(?P<version>[\d.]+)/ajax_feedback$', views.ajax_feedback,
         name='ajax_feedback'),
     url(r'^quiz/(?P<quiz_id>[0-9]+)/$', views.quiz, name='quiz'),
     url(r'^(?P<course_code>[A-Z0-9]+)/create_quiz/$', views.create_quiz, name='create_quiz'),
@@ -71,16 +71,16 @@
         views.remove_question, name='remove_question'),
     url(r'^(?P<course_code>[A-Z0-9]+)/edit_bank/(?P<qb_code>[0-9]+)$',
         views.edit_bank, name='edit_bank'),
-    url(r'^(?P<course_code>[A-Z0-9]+)/attendance$', views.submit_attendance,
+    url(r'^(?P<course_code>[A-Z0-9]+)/(?P<version>[\d.]+)/attendance$', views.submit_attendance,
         name='submit_attendance'),
-    url(r'^(?P<course_code>[A-Z0-9]+)/add_attendance$', views.add_attendance,
+    url(r'^(?P<course_code>[A-Z0-9]+)/(?P<version>[\d.]+)/add_attendance$', views.add_attendance,
         name='add_attendance'),
-    url(r'^(?P<course_code>[A-Z0-9]+)/create_grading_scheme$',
+    url(r'^(?P<course_code>[A-Z0-9]+)/(?P<version>[\d.]+)/create_grading_scheme$',
         views.create_grading_scheme, name='Create_grading_scheme'),
     url(r'^admin/add_academic_calendar', views.add_academic_calendar, name='Add Calendar'),
     url(r'^admin/update_calendar', views.update_calendar, name='Add Calendar'),
     url(r'^admin/add_timetable', views.add_timetable, name="add_timetable"),
     url(r'^admin/delete_timetable', views.delete_timetable, name='delete_timetable'),
-    url(r'^(?P<course_code>[A-z0-9]+)/submit_marks$',views.submit_marks, name='submit_marks'),
+    url(r'^(?P<course_code>[A-z0-9]+)/(?P<version>[\d.]+)/submit_marks$',views.submit_marks, name='submit_marks'),
         ]
 
diff --git a/FusionIIIT/applications/online_cms/views.py b/FusionIIIT/applications/online_cms/views.py
index d75d304f2..ffeaa7087 100644
--- a/FusionIIIT/applications/online_cms/views.py
+++ b/FusionIIIT/applications/online_cms/views.py
@@ -15,10 +15,11 @@
 from django.shortcuts import redirect, render
 from django.utils import timezone
 from django.core.serializers import serialize
-
-from applications.academic_information.models import (Course, Curriculum_Instructor,Curriculum,
-                                                      Student,Student_attendance,Calendar, Timetable)
-from applications.academic_procedures.models import Register
+from decimal import Decimal
+from applications.academic_information.models import (Student,Student_attendance,Calendar, Timetable)
+from applications.programme_curriculum.models import Course as Courses
+from applications.programme_curriculum.models import CourseInstructor
+from applications.academic_procedures.models import course_registration
 from applications.globals.models import ExtraInfo
 from applications.globals.models import *
 
@@ -38,12 +39,12 @@ def viewcourses(request):
     extrainfo = ExtraInfo.objects.select_related().get(user=user)  #get the type of user
     if extrainfo.user_type == 'student':         #if student is using
         student = Student.objects.select_related('id').get(id=extrainfo)
-        roll = student.id.id[:4]                       #get the roll no. of the student
-        register = Register.objects.select_related().filter(student_id=student, semester=semester(roll))
+        roll = student.id.id[:2]                       #get the roll no. of the student
+        register = course_registration.objects.select_related().filter(student_id=student)
         #info of registered student
         courses = collections.OrderedDict()   #courses in which student is registerd
         for reg in register:   #info of the courses
-            instructor = Curriculum_Instructor.objects.select_related().get(curriculum_id=reg.curr_id)
+            instructor = CourseInstructor.objects.select_related().get(course_id = reg.course_id)
             courses[reg] = instructor
 
         return render(request, 'coursemanagement/coursemanagement1.html',
@@ -51,10 +52,10 @@ def viewcourses(request):
 
                        'extrainfo': extrainfo})
     elif extrainfo.user_type == 'faculty':   #if the user is lecturer
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)   #get info of the instructor
+        instructor = CourseInstructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)   #get info of the instructor
         curriculum_list = []
         for x in instructor:
-            c = Curriculum.objects.select_related().get(curriculum_id = x.curriculum_id.curriculum_id)
+            c = Courses.objects.select_related().get(pk = x.course_id)
             curriculum_list.append(c)
 
         return render(request, 'coursemanagement/coursemanagement1.html',
@@ -77,7 +78,7 @@ def viewcourses(request):
 
 
 @login_required
-def course(request, course_code):
+def course(request, course_code, version):
     '''
     desc: Home page for each courses for Student/Faculty
     '''
@@ -88,13 +89,10 @@ def course(request, course_code):
         if request.session.get('currentDesignationSelected') != 'student':
             return HttpResponseRedirect('/dashboard/')
         student = Student.objects.select_related('id').get(id=extrainfo)
-        roll = student.id.id[:4]
-
         #info about courses he is registered in
-        curriculum = Curriculum.objects.select_related('course_id').get(course_code=course_code)
-        course = curriculum.course_id
+        course = Courses.objects.select_related().get(code=course_code, version = version)
         #instructor of the course
-        instructor = Curriculum_Instructor.objects.select_related().get(curriculum_id=curriculum)
+        instructor = CourseInstructor.objects.select_related().get(course_id = course, batch_id = student.batch_id)
         #course material uploaded by the instructor
         # videos = CourseVideo.objects.filter(course_id=course)
         videos = []
@@ -226,7 +224,7 @@ def course(request, course_code):
         
         present_attendance = {}
         total_attendance=None
-        a = Student_attendance.objects.select_related().filter(student_id=student , instructor_id = instructor)
+        a = Attendance.objects.select_related().filter(student_id=student , instructor_id = instructor)
         total_attendance = len(a)
         count = 0
         for row in a:
@@ -270,16 +268,15 @@ def course(request, course_code):
                        'attendance_percent': attendance_percent,
                        'Lecturer': lec,
                        'attendance_file':attendance_file,
-                       'curriculum': curriculum,
                        'notifications': notifs})
 
     else:
         if request.session.get('currentDesignationSelected') != "faculty" and request.session.get('currentDesignationSelected') != "Associate Professor" and request.session.get('currentDesignationSelected') != "Professor" and request.session.get('currentDesignationSelected') != "Assistant Professor":
             return HttpResponseRedirect('/dashboard/')
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)
         for ins in instructor:
-            if ins.curriculum_id.course_code == course_code:
-                registered_students = Register.objects.select_related('student_id').filter(curr_id = ins.curriculum_id.curriculum_id)
+            if ins.course_id.code == course_code and ins.course_id.version == Decimal(version):
+                registered_students = course_registration.objects.select_related('student_id').filter(course_id = ins.course_id)
                 students = {}
                 test_marks = {}
                 for x in registered_students:
@@ -292,8 +289,7 @@ def course(request, course_code):
                     #for x in stored_marks:
                     #    print(x)
 
-                curriculum = ins.curriculum_id
-                course = ins.curriculum_id.course_id
+                course = ins.course_id
                 result_topics = Topics.objects.select_related().filter(course_id = course)
                 if (len(list(result_topics))!=0):
                     topics = result_topics
@@ -302,7 +298,7 @@ def course(request, course_code):
                 present_attendance = {}
                 total_attendance=None
                 for x in registered_students:
-                    a = Student_attendance.objects.select_related().filter(student_id=x.student_id , instructor_id = ins)
+                    a = Attendance.objects.select_related().filter(student_id=x.student_id , instructor_id = ins)
                     total_attendance = len(a)
                     count =0
                     for row in a:
@@ -320,6 +316,7 @@ def course(request, course_code):
 
         lec = 1
         videos = []
+        
         # videos = CourseVideo.objects.filter(course_id=course)
         # channel_url = "https://www.googleapis.com/youtube/v3/channels"
         # playlist_url = "https://www.googleapis.com/youtube/v3/playlistItems"
@@ -413,7 +410,6 @@ def course(request, course_code):
         return render(request, 'coursemanagement/viewcourse.html',
                       {'instructor': instructor,
                        'extrainfo': extrainfo,
-                       'curriculum': curriculum,
                        'students' : students,
                        'registered_students': registered_students,
                        'modules': modules_with_slides,
@@ -437,7 +433,7 @@ def course(request, course_code):
 
 #when student uploads the assignment's solution
 @login_required
-def upload_assignment(request, course_code):
+def upload_assignment(request, course_code, version):
     extrainfo = ExtraInfo.objects.select_related().get(user=request.user)
     if extrainfo.user_type == "student":
         student = Student.objects.select_related('id').get(id=extrainfo)
@@ -451,7 +447,7 @@ def upload_assignment(request, course_code):
         except:
             return HttpResponse("Please fill each and every field correctly!", status=422)
         filename = name
-        full_path = settings.MEDIA_ROOT + "/online_cms/" + course_code + "/assi/"  #storing the media files
+        full_path = settings.MEDIA_ROOT + "/online_cms/" + course_code + "/" + version + "/assi/"  #storing the media files
         full_path = full_path + assign.assignment_name + "/" + student.id.id + "/"
         url = settings.MEDIA_URL + filename
         if not os.path.isdir(full_path):
@@ -460,7 +456,7 @@ def upload_assignment(request, course_code):
         fs = FileSystemStorage(full_path, url)
         fs.save(name + file_extenstion, doc)  #saving the media files
         # uploaded_file_url = full_path+ "/" + name + file_extenstion
-        uploaded_file_url = "/media/online_cms/" + course_code + "/assi/" + assign.assignment_name + "/" + student.id.id + "/" + name + file_extenstion
+        uploaded_file_url = "/media/online_cms/" + course_code + "/" + version + "/assi/" + assign.assignment_name + "/" + student.id.id + "/" + name + file_extenstion
         # to save the solution of assignment the database
         sa = StudentAssignment(
          student_id=student,
@@ -475,14 +471,14 @@ def upload_assignment(request, course_code):
 
 # when faculty creates modules
 @login_required
-def add_modules(request, course_code):
+def add_modules(request, course_code, version):
     extrainfo = ExtraInfo.objects.select_related().get(user=request.user)
     if extrainfo.user_type == "faculty":  #user should be faculty only
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)  #get the course information
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)  #get the course information
 
         for ins in instructor:
-            if ins.curriculum_id.course_code == course_code:
-                course = ins.curriculum_id.course_id
+            if ins.course_id.code == course_code and ins.course_id.version == Decimal(version):
+                course = ins.course_id
 
         try:
             module_name = request.POST.get('module_name')
@@ -499,14 +495,14 @@ def add_modules(request, course_code):
 
 # when faculty uploads the slides, ppt
 @login_required
-def add_document(request, course_code):
+def add_document(request, course_code, version):
     extrainfo = ExtraInfo.objects.select_related().get(user=request.user)
     if extrainfo.user_type == "faculty":  #user should be faculty only
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)  #get the course information
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)  #get the course information
 
         for ins in instructor:
-            if ins.curriculum_id.course_code == course_code:
-                course = ins.curriculum_id.course_id
+            if ins.course_id.code == course_code and ins.course_id.version == Decimal(version):
+                course = ins.course_id
 
         try:
             description = request.POST.get('description')
@@ -518,7 +514,7 @@ def add_document(request, course_code):
             return HttpResponse("Please fill each and every field correctly!",status=422)
         #for storing the media files properly
         filename = name
-        full_path = settings.MEDIA_ROOT + "/online_cms/" + course_code + "/doc/"
+        full_path = settings.MEDIA_ROOT + "/online_cms/" + course_code + "/" + version + "/doc/"
         url = settings.MEDIA_URL + filename + file_extenstion
         if not os.path.isdir(full_path):
             cmd = "mkdir " + full_path
@@ -526,7 +522,7 @@ def add_document(request, course_code):
         fs = FileSystemStorage(full_path, url)
         fs.save(filename + file_extenstion, doc)
         # uploaded_file_url = full_path + filename + file_extenstion
-        uploaded_file_url = "/media/online_cms/" + course_code + "/doc/" + filename + file_extenstion
+        uploaded_file_url = "/media/online_cms/" + course_code  + "/" + version + "/doc/" + filename + file_extenstion
         #save the info/details in the database
         CourseDocuments.objects.create(
             course_id=course,
@@ -542,14 +538,14 @@ def add_document(request, course_code):
 
 # if faculty uploads the attendance file
 @login_required
-def add_attendance(request, course_code):
+def add_attendance(request, course_code, version):
     extrainfo = ExtraInfo.objects.select_related().get(user=request.user)
     if extrainfo.user_type == "faculty":  #user should be faculty only
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)  #get the course information
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)  #get the course information
 
         for ins in instructor:
-            if ins.curriculum_id.course_code == course_code:
-                course = ins.curriculum_id.course_id
+            if ins.course_id.code == course_code and ins.course_id.version == Decimal(version):
+                course = ins.course_id
 
         try:
             doc = request.FILES.get('img')
@@ -559,7 +555,7 @@ def add_attendance(request, course_code):
             return HttpResponse("Please fill each and every field correctly!",status=422)
         #for storing the media files properly
         filename = name
-        full_path = settings.MEDIA_ROOT + "/online_cms/" + course_code + "/attendance/"
+        full_path = settings.MEDIA_ROOT + "/online_cms/" + course_code + "/" + version + "/attendance/"
         url = settings.MEDIA_URL + filename + file_extenstion
         if not os.path.isdir(full_path):
             cmd = "mkdir " + full_path
@@ -567,7 +563,7 @@ def add_attendance(request, course_code):
         fs = FileSystemStorage(full_path, url)
         fs.save(filename + file_extenstion, doc)
         # uploaded_file_url = full_path + filename + file_extenstion
-        uploaded_file_url = "/media/online_cms/" + course_code + "/attendance/" + filename + file_extenstion
+        uploaded_file_url = "/media/online_cms/" + course_code + "/" + version + "/attendance/" + filename + file_extenstion
         #save the info/details in the database
         AttendanceFiles.objects.create(
             course_id=course,
@@ -581,23 +577,23 @@ def add_attendance(request, course_code):
 
 #it is to delete things(assignment, slides, videos, ) from the dustin icon or delete buttons
 @login_required
-def delete(request, course_code):
+def delete(request, course_code, version):
     data_type = request.POST.get('type')
     user = request.user
     extrainfo = ExtraInfo.objects.select_related().get(user=user)
     #get the course and user information first
 
     if extrainfo.user_type == "faculty":
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)  #get the course information
+
         for ins in instructor:
-            if ins.curriculum_id.course_code == course_code:
-                course = ins.curriculum_id.course_id
+            if ins.course_id.code == course_code and ins.course_id.version == Decimal(version):
+                course = ins.course_id
 
     if extrainfo.user_type == 'student':
-        curriculum_details = Curriculum.objects.select_related('course_id').filter(course_code=course_code)
+        curriculum_details = Courses.objects.select_related().filter(code=course_code, version=version)
         course = curriculum_details
-        course1 = curriculum_details[0].course_id
-        curriculum1 = course[0]
+
     pk = request.POST.get('pk')
     path = ""
     #to delete videos
@@ -636,10 +632,11 @@ def add_videos(request, course_code):
     extrainfo = ExtraInfo.objects.select_related().get(user=request.user)
     #only faculty can add the videos
     if extrainfo.user_type == "faculty":
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)
+
         for ins in instructor:
-            if ins.curriculum_id.course_code == course_code:
-                course = ins.curriculum_id.course_id
+            if ins.course_id.code == course_code:
+                course = ins.course_id
         try:
             description = request.POST.get('description')   #the media files required
             vid = request.FILES.get('img')
@@ -673,20 +670,20 @@ def add_videos(request, course_code):
 
 
 @login_required
-def forum(request, course_code):
+def forum(request, course_code, version):
     # take care of sem
     extrainfo = ExtraInfo.objects.select_related().get(user=request.user)
     if extrainfo.user_type == "student":
         student = Student.objects.select_related('id').get(id=extrainfo)
         roll = student.id.id[:4]
-        course = Course.objects.select_related().get(course_id=course_code, sem=semester(roll))
+        course = Courses.objects.select_related().get(course=course_code, version=version)
     else:
-        instructor = Curriculum_Instructor.objects.select_related().filter(instructor_id=extrainfo)
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)
         for ins in instructor:
-            if ins.course_id.course_id == course_code:
-                course = ins.course_id
+            if ins.course_id.code == course_code and ins.course_id.version == Decimal(version):
+                course = ins.course_id.pk
     comments = Forum.objects.select_related().filter(course_id=course).order_by('comment_time')
-    instructor = Curriculum_Instructor.objects.get(course_id=course)
+    instructor = CourseInstructor.objects.get(course_id=course)
     if instructor.instructor_id.user.pk == request.user.pk:
         lec = 1
     else:
@@ -702,22 +699,21 @@ def forum(request, course_code):
 
 
 @login_required
-def ajax_reply(request, course_code):
+def ajax_reply(request, course_code, version):
     extrainfo = ExtraInfo.objects.select_related().get(user=request.user)
     if extrainfo.user_type == "student":
         student = Student.objects.select_related('id').get(id=extrainfo)
         roll = student.id.id[:4]
 
-        curriculum_details = Curriculum.objects.select_related('course_id').filter(course_code=course_code)  #curriculum id
         #print(curriculum_details[0].course_id)
         #print(Curriculum.objects.values_list('curriculum_id'))
-        course =  curriculum_details[0].course_id
+        course = Courses.objects.select_related().filter(code=course_code, version=version)
        # course = Course.objects.get(course_id=course_code, sem=semester(roll))
     else:
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)
         for ins in instructor:
-            if ins.curriculum_id.course_code == course_code:
-                course = ins.curriculum_id.course_id
+            if ins.course_id.code == course_code and ins.course_id.version == Decimal(version):
+                course = ins.course_id.pk
     ex = ExtraInfo.objects.select_related().get(user=request.user)
     f = Forum(
         course_id=course,
@@ -738,7 +734,7 @@ def ajax_reply(request, course_code):
 
 
 @login_required
-def ajax_new(request, course_code):
+def ajax_new(request, course_code, version):
     # extrainfo = ExtraInfo.objects.select_related().get(user=request.user)
     # if extrainfo.user_type == "student":
     #     student = Student.objects.select_related('id').get(id=extrainfo)
@@ -771,11 +767,11 @@ def ajax_new(request, course_code):
         print()
     else:
         HttpResponse('Announcement in Progress')
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=ex)
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=ex)
         for ins in instructor:
-            if ins.curriculum_id.course_code == course_code:
-                course = ins.curriculum_id.course_id    
-                registered_students = Register.objects.filter(curr_id = ins.curriculum_id.curriculum_id)
+            if ins.course_id.code == course_code and ins.course_id.version == Decimal(version):
+                course = ins.course_id    
+                registered_students = course_registration.objects.filter(course_id = ins.course_id)
         
         f = Forum(
             course_id=course,
@@ -794,7 +790,7 @@ def ajax_new(request, course_code):
             student.append(Student.objects.get(id = str(reg_student.student_id)).id.user)
             # student = Student.objects.get(id = str(reg_student.student_id))
             
-        course_management_notif(request.user, student,  request.POST.get('question'), course.pk, str(course),course_code, "announcement")
+        course_management_notif(request.user, student,  request.POST.get('question'), course.pk, str(course.name),course_code, "announcement")
 
     return HttpResponse(json.dumps(data), content_type='application/json')
 
@@ -824,14 +820,14 @@ def ajax_remove(request, course_code):
 
 
 @login_required
-def add_assignment(request, course_code):                 #from faculty side
+def add_assignment(request, course_code, version):                 #from faculty side
     extrainfo = ExtraInfo.objects.select_related().get(user=request.user)
     if extrainfo.user_type == "faculty":
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)
         for ins in instructor:
-            if ins.curriculum_id.course_code == course_code:
-                course = ins.curriculum_id.course_id
-                registered_students = Register.objects.filter(curr_id = ins.curriculum_id.curriculum_id)
+            if ins.course_id.code == course_code and ins.course_id.version == Decimal(version):
+                course = ins.course_id
+                registered_students = course_registration.objects.filter(course_id = ins.course_id)
         try:
             assi = request.FILES.get('img')
             name = request.POST.get('name')
@@ -839,14 +835,14 @@ def add_assignment(request, course_code):                 #from faculty side
         except:
             return HttpResponse("Please Enter The Form Properly",status=422)
         filename = name
-        full_path = settings.MEDIA_ROOT + "/online_cms/" + course_code + "/assi/" + name + "/"
+        full_path = settings.MEDIA_ROOT + "/online_cms/" + course_code + "/" + version  + "/assi/" + name + "/"
         url = settings.MEDIA_URL + filename
         if not os.path.isdir(full_path):
             cmd = "mkdir " + full_path
             subprocess.call(cmd, shell=True)
         fs = FileSystemStorage(full_path, url)
         fs.save(filename+file_extenstion, assi)
-        uploaded_file_url = "/media/online_cms/"+ course_code + "/assi/" + name + "/" + filename + file_extenstion
+        uploaded_file_url = "/media/online_cms/"+ course_code + "/" + version + "/assi/" + name + "/" + filename + file_extenstion
         # uploaded_file_url = full_path + filename + file_extenstion
         assign = Assignment(
             course_id=course,
@@ -859,7 +855,7 @@ def add_assignment(request, course_code):                 #from faculty side
         for reg_student in registered_students:
             student.append(Student.objects.get(id = str(reg_student.student_id)).id.user)
         print(student)
-        course_management_notif(request.user, student,  "New Assignment Created!", course.pk, str(course),course_code,0)
+        course_management_notif(request.user, student,  "New Assignment Created!", course.pk, str(course.name),course_code,0)
         return HttpResponse("Assignment created successfully.")
     else:
         return HttpResponse("not found")
@@ -871,10 +867,10 @@ def edit_bank(request, course_code, qb_code):
     extrainfo = ExtraInfo.objects.select_related().get(user=user)
     lec = 1
     if extrainfo.user_type == "faculty":
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)
         for ins in instructor:
-            if ins.curriculum_id.course_code == course_code:
-                course = ins.curriculum_id.course_id
+            if ins.course_id.code == course_code:
+                course = ins.course_id
         qb = QuestionBank.objects.select_related().filter(id=qb_code)
         topics = Topics.objects.select_related().filter(course_id=course)
         Topic = {}
@@ -902,10 +898,10 @@ def create_bank(request, course_code):
     user = request.user
     extrainfo = ExtraInfo.objects.select_related().get(user=user)
     if extrainfo.user_type == "faculty":
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)
         for ins in instructor:
-            if ins.curriculum_id.course_code == course_code:
-                course = ins.curriculum_id.course_id
+            if ins.course_id.code == course_code:
+                course = ins.course_id
         qb = QuestionBank.objects.create(instructor_id=extrainfo,
                                          course_id=course, name=request.POST.get('qbname'))
         return redirect('/ocms/' + course_code + '/edit_bank/'+str(qb.id))
@@ -915,10 +911,10 @@ def create_topic(request, course_code):
     user = request.user
     extrainfo = ExtraInfo.objects.select_related().get(user=user)
     if extrainfo.user_type == "faculty":
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)
         for ins in instructor:
-            if ins.curriculum_id.course_code == course_code:
-                course = ins.curriculum_id.course_id
+            if ins.course_id.code == course_code:
+                course = ins.course_id
         topic = Topics.objects.create(course_id=course, topic_name=request.POST.get('topic_name'))
         return redirect('/ocms/' + course_code)
 
@@ -929,10 +925,10 @@ def remove_bank(request, course_code):
     user = request.user
     extrainfo = ExtraInfo.objects.select_related().get(user=user)
     if extrainfo.user_type == "faculty":
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)
         for ins in instructor:
-            if ins.curriculum_id.course_code == course_code:
-                course = ins.curriculum_id.course_id
+            if ins.course_id.code == course_code:
+                course = ins.course_id
         qb = QuestionBank.objects.select_related().get(id=request.POST.get('pk'))
         qb.delete()
         qb = QuestionBank.objects.select_related().filter(instructor_id=extrainfo, course_id=course)
@@ -944,10 +940,10 @@ def remove_topic(request, course_code):
     user = request.user
     extrainfo = ExtraInfo.objects.select_related().get(user=user)
     if extrainfo.user_type == "faculty":
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)
         for ins in instructor:
-            if ins.curriculum_id.course_code == course_code:
-                course = ins.curriculum_id.course_id
+            if ins.course_id.code == course_code:
+                course = ins.course_id
         topic = Topics.objects.select_related().get(id=request.POST.get('pk'))
         topic.delete()
         n_topics = Topics.objects.select_related().filter(course_id=course)
@@ -958,7 +954,7 @@ def remove_topic(request, course_code):
 @login_required
 def add_question(request, course_id, qb_code, topic_id):
     user = request.user
-    course = Course.objects.select_related().get(pk=course_id)
+    course = Courses.objects.select_related().get(pk=course_id)
     curriculum = Curriculum.objects.select_related().get(course_id=course)
     course_code = curriculum.course_code
     extrainfo = ExtraInfo.objects.select_related().get(user=user)
@@ -1016,9 +1012,9 @@ def edit_qb_topics(request, course_code, qb_code, topic_id):
     extrainfo = ExtraInfo.objects.select_related().get(user=user)
     lec = 1
     if extrainfo.user_type == "faculty":
-        instructor = Curriculum_Instructor.objects.select_related().filter(instructor_id=extrainfo)
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)
         for ins in instructor:
-            if ins.course_id.course_id == course_code:
+            if ins.course_id.code == course_code:
                 course = ins.course_id
         qb = QuestionBank.objects.select_related().filter(pk=qb_code)
         topic = Topics.objects.select_related().get(id=topic_id)
@@ -1117,11 +1113,10 @@ def create_quiz(request, course_code):
     extrainfo = ExtraInfo.objects.select_related().get(user=request.user)
 
     if extrainfo.user_type == 'faculty':
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)
         for ins in instructor:
-            if ins.curriculum_id.course_code == course_code:
-                curriculum = ins.curriculum_id
-                course = ins.curriculum_id.course_id
+            if ins.course_id.code == course_code:
+                course = ins.course_id
 
         for ins in instructor:
             if ins.curriculum_id.course_code == course_code:
@@ -1218,11 +1213,11 @@ def edit_quiz(request, course_code, quiz_code):
     extrainfo = ExtraInfo.objects.select_related().get(user=request.user)
     if extrainfo.user_type == 'faculty':
         lec = 1
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)
         for ins in instructor:
-            if ins.curriculum_id.course_code == course_code:
-                curriculum = ins.curriculum_id
-                course = ins.curriculum_id.course_id
+            if ins.course_id.code == course_code:
+                course = ins.course_id
+                registered_students = course_registration.objects.filter(course_id = ins.course_id)
         # errors = None
         quiz = Quiz.objects.select_related().get(pk=quiz_code)
         questions = QuizQuestion.objects.select_related('question').filter(quiz_id=quiz)
@@ -1253,10 +1248,11 @@ def edit_quiz_topic(request, course_code, quiz_code, topic_id):
     extrainfo = ExtraInfo.objects.select_related().get(user=user)
     lec = 1
     if extrainfo.user_type == "faculty":
-        instructor = Curriculum_Instructor.objects.select_related().filter(instructor_id=extrainfo)
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)
         for ins in instructor:
-            if ins.course_id.course_id == course_code:
+            if ins.course_id.code == course_code:
                 course = ins.course_id
+                registered_students = course_registration.objects.filter(course_id = ins.course_id)
         quiz_question = QuizQuestion.objects.select_related('question').filter(quiz_id=quiz_code)
         quest = []
         quiz = Quiz.objects.select_related().get(pk=quiz_code)
@@ -1286,10 +1282,10 @@ def remove_quiz_question(request, course_code, quiz_code, topic_id):
 def add_question_topicwise(request, course_code, quiz_id):
     extrainfo = ExtraInfo.objects.select_related().get(user=request.user)
     if extrainfo.user_type == 'faculty':
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)
         for ins in instructor:
-            if ins.curriculum_id.course_code == course_code:
-                course = ins.curriculum_id.course_id
+            if ins.course_id.code == course_code:
+                course = ins.course_id
         ques_bank = request.POST.get('qbank')
         quiz = Quiz.objects.select_related().get(pk=quiz_id)
         topic = request.POST.get('topic')
@@ -1314,7 +1310,7 @@ def add_question_topicwise(request, course_code, quiz_id):
 
 @login_required
 def add_questions_to_quiz(request, course_id, quiz_id):
-    course = Course.objects.select_related().get(pk=course_id)
+    course = Courses.objects.select_related().get(pk=course_id)
     curriculum = Curriculum.objects.select_related().get(course_id = course)
     course_code = curriculum.course_code
     extrainfo = ExtraInfo.objects.select_related().get(user=request.user)
@@ -1334,10 +1330,10 @@ def add_questions_to_quiz(request, course_id, quiz_id):
 def preview_quiz(request, course_code, quiz_code):
     extrainfo = ExtraInfo.objects.select_related().get(user=request.user)
     if extrainfo.user_type == 'faculty':
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)
         for ins in instructor:
-            if ins.curriculum_id.course_code == course_code:
-                course = ins.curriculum_id.course_id
+            if ins.course_id.code == course_code:
+                course = ins.course_id
     quiz = Quiz.objects.select_related().get(pk=quiz_code)
     questions = QuizQuestion.objects.select_related().filter(quiz_id=quiz)
 
@@ -1368,13 +1364,13 @@ def remove_quiz(request, course_code):
 
 
 @login_required
-def ajax_assess(request, course_code):
+def ajax_assess(request, course_code, version):
     extrainfo = ExtraInfo.objects.select_related().get(user=request.user)
     if extrainfo.user_type == "faculty":
-        instructor = Curriculum_Instructor.objects.select_related('curriculum_id').filter(instructor_id=extrainfo)
+        instructor = CourseInstructor.objects.select_related('course_id').filter(instructor_id=extrainfo)
         for ins in instructor:
-            if ins.curriculum_id.course_code == course_code:
-                course = ins.curriculum_id.course_id
+            if ins.course_id.code == course_code and ins.course_id.version == Decimal(version):
+                course = ins.course_id
                 # registered_students = Register.objects.filter(curr_id = ins.curriculum_id.curriculum_id)
         sa = StudentAssignment.objects.select_related().get(pk=request.POST.get('pk'))
         sa.score = request.POST.get('marks')
@@ -1383,12 +1379,12 @@ def ajax_assess(request, course_code):
         student.append(sa.student_id.id.user)
         # for reg_student in registered_students:
         # #     student.append(Student.objects.get(id = str(reg_student.student_id)).id.user)
-        course_management_notif(request.user, student,  "An Assignment has been graded!", course.pk, str(course),course_code, 0)
+        course_management_notif(request.user, student,  "An Assignment has been graded!", course.pk, str(course.name),course_code, 0)
         return HttpResponse("Marks uploaded")    
 
 
 @login_required
-def ajax_feedback(request, course_code):
+def ajax_feedback(request, course_code, version):
     sa = StudentAssignment.objects.select_related().get(pk=request.POST.get('pk'))
     sa.feedback = request.POST.get('feedback')
     sa.save()
@@ -1587,14 +1583,14 @@ def get_exam_data(request,course_code):   #it is store the type of exam helpful
 
 #to store the attendance of the student by taking from templates (attendance.html)
 @login_required
-def submit_attendance(request, course_code):
+def submit_attendance(request, course_code, version):
 
     user = request.user
     extrainfo = ExtraInfo.objects.select_related().get(user=user)
-    course_id = Curriculum.objects.select_related().get(course_code=course_code)
+    course_id = Courses.objects.select_related().get(code=course_code, version=version)
 
     if extrainfo.user_type == 'faculty':   #only faculty can change the attendance of the students
-        instructor_old = Curriculum_Instructor.objects.select_related().filter(instructor_id=extrainfo, curriculum_id_id=course_id)
+        instructor_old = CourseInstructor.objects.select_related().filter(instructor_id=extrainfo, course_id=course_id)
     for x in instructor_old:
         instructor = x
 
@@ -1622,7 +1618,7 @@ def submit_attendance(request, course_code):
                 if student in present_students:
                     present = True
 
-                Student_attendance.objects.create(
+                Attendance.objects.create(
                         student_id = s_id,
                         instructor_id = instructor,
                         date = date,
@@ -1634,11 +1630,11 @@ def submit_attendance(request, course_code):
 
 #to store the grading scheme created by the faculty
 @login_required
-def create_grading_scheme(request, course_code):
+def create_grading_scheme(request, course_code, version):
  
     user = request.user
     extrainfo = ExtraInfo.objects.select_related().get(user=user)
-    course_id = Curriculum.objects.select_related().get(course_code=course_code)
+    course_id = Courses.objects.select_related().get(code=course_code, version=version)
     if extrainfo.user_type == 'faculty':   #only faculty can change the attendance of the students
         if request.method == 'POST':
                          
@@ -1650,8 +1646,7 @@ def create_grading_scheme(request, course_code):
  
             # data to be sent to the gradingscheme table
             key_list = list(form_data.keys())
- 
-            course_id = Course.objects.select_related().get(id=course_id.course_id_id)    
+  
             no_of_evaluation_types = len(form_data) - 20
             
             for i in range(no_of_evaluation_types):
@@ -1719,7 +1714,7 @@ def create_grading_scheme(request, course_code):
                         F_Upper = form_data['F_Upper']
                     )
                 grading_scheme_grades.save()
-                course(request, course_code)
+                course(request, course_code, version)
             return HttpResponse("Upload successful.")
     
 
@@ -1893,11 +1888,11 @@ def delete_timetable(request):
             return HttpResponse("TimeTable Deleted")
 
 @login_required
-def submit_marks(request, course_code):
+def submit_marks(request, course_code, version):
  
     user = request.user
     extrainfo = ExtraInfo.objects.select_related().get(user=user)
-    course_id = Curriculum.objects.select_related().get(course_code=course_code)
+    course_id = Courses.objects.select_related().get(code=course_code, version=version)
     if extrainfo.user_type == 'faculty':
         if request.method == 'POST':
                          
@@ -1914,23 +1909,23 @@ def submit_marks(request, course_code):
                 already_existing_data = Student_grades.objects.filter(roll_no=str(form_data.getlist('stu_marks')[(i*3)]))
                 if already_existing_data.exists():
                     already_existing_data.update(
-                        semester = semester(student.id.id[:4]),
+                        semester = student.curr_semester_no,
                         year = year,
                         roll_no = str(form_data.getlist('stu_marks')[(i*3)]),
                         total_marks = (form_data.getlist('stu_marks')[(i*3+1)]),
                         grade = str(form_data.getlist('stu_marks')[(i*3+2)]),
                         batch = batch,
-                        course_id = course_id.course_id,
+                        course_id = course_id,
                     )
                 else:
                     student_grades = Student_grades.objects.create(
-                        semester = semester(student.id.id[:4]),
+                        semester = student.curr_semester_no,
                         year = year,
                         roll_no = str(form_data.getlist('stu_marks')[(i*3)]),
                         total_marks = (form_data.getlist('stu_marks')[(i*3+1)]),
                         grade = str(form_data.getlist('stu_marks')[(i*3+2)]),
                         batch = batch,
-                        course_id = course_id.course_id,
+                        course_id = course_id,
                     )
                     student_grades.save()
             return HttpResponse("Upload successful.")
\ No newline at end of file
diff --git a/FusionIIIT/templates/academic_procedures/academicfac.html b/FusionIIIT/templates/academic_procedures/academicfac.html
index 807f64481..53095463c 100644
--- a/FusionIIIT/templates/academic_procedures/academicfac.html
+++ b/FusionIIIT/templates/academic_procedures/academicfac.html
@@ -148,7 +148,7 @@
                                 </td>
 
                                 <td class="collapsing"><a class="tiny ui positive animated button"  style="background:#2590e2;" tabindex="0"
-                                    href="{% url 'online_cms:course' obj.course_id.code %}"
+                                    href="{% url 'online_cms:course' obj.course_id.code obj.course_id.version %}"
                                     type="Submit" name="Submit">
                                         <div class="visible content">MANAGE</div>
                                         <div class="hidden content">
diff --git a/FusionIIIT/templates/academic_procedures/current_sem.html b/FusionIIIT/templates/academic_procedures/current_sem.html
index 5ec5b478d..dedcf982a 100755
--- a/FusionIIIT/templates/academic_procedures/current_sem.html
+++ b/FusionIIIT/templates/academic_procedures/current_sem.html
@@ -95,7 +95,7 @@
                 <center>{{curr_sem.semester_no}}</center>
             </td>
             <td class="collapsing"><a class="tiny ui positive animated button"  style="background:#2590e2;" tabindex="0"
-              href="{% url 'online_cms:course' items.1.code %}"
+              href="{% url 'online_cms:course' items.1.code items.1.version %}"
               type="Submit" name="Submit">
                   <div class="visible content">MANAGE</div>
                   <div class="hidden content">
diff --git a/FusionIIIT/templates/coursemanagement/assessment.html b/FusionIIIT/templates/coursemanagement/assessment.html
index f2e5e8d0a..f7b8d9c66 100644
--- a/FusionIIIT/templates/coursemanagement/assessment.html
+++ b/FusionIIIT/templates/coursemanagement/assessment.html
@@ -8,7 +8,7 @@
         </a> -->
 </div>
 <div class="ui tab segment active" id="refresh_asn_tab" data-tab="assignment">
-  <h4 class="ui dividing header">{{course.course_name}}</h4>
+  <h4 class="ui dividing header">{{course.name}}</h4>
 
   <div class="ui top attached tabular menu"  style="overflow:auto;overflow-y:hidden;">
       {% for assi in assignment %}
@@ -89,7 +89,7 @@ <h4 class="ui image header">
 
 <div class="ui tab segment" data-tab="exams" style="overflow:scroll;overflow-y:hidden">
   
-  <form class="ui large form" name="entermarks" id="entermarks" method="POST" action="/ocms/{{curriculum.course_code}}/edit_marks"> 
+  <form class="ui large form" name="entermarks" id="entermarks" method="POST" action="/ocms/{{course.code}}/edit_marks"> 
     
     {% csrf_token %}
   <div id="refresh_table">
@@ -183,7 +183,7 @@ <h4 class="ui image header">
   
   $.ajax({
     method: "POST",
-    url: '/ocms/{{curriculum.course_code}}/get_exam_data',
+    url: '/ocms/{{course.code}}/get_exam_data',
     data: {"exam_name": exam_name, 'csrfmiddlewaretoken': csrf }
   }).done(function (response) {
     console.log(response);  // changing the default value as the already saved marks
diff --git a/FusionIIIT/templates/coursemanagement/attendance.html b/FusionIIIT/templates/coursemanagement/attendance.html
index 0f9a1af5b..aeccd68ce 100644
--- a/FusionIIIT/templates/coursemanagement/attendance.html
+++ b/FusionIIIT/templates/coursemanagement/attendance.html
@@ -116,7 +116,7 @@
 </div>
 </div>
 <div class="ui tab segment" id="refresh_submit_tab" data-tab="submit">
-    <form class="ui form" id="attendance_submit" method="post" action="/ocms/{{curriculum.course_code}}/attendance">
+    <form class="ui form" id="attendance_submit" method="post" action="/ocms/{{course.code}}/{{course.version}}/attendance">
     {% csrf_token %}
 
     	<div class="field">
diff --git a/FusionIIIT/templates/coursemanagement/comments.html b/FusionIIIT/templates/coursemanagement/comments.html
index 03fb8ad8e..f97a2c5b0 100644
--- a/FusionIIIT/templates/coursemanagement/comments.html
+++ b/FusionIIIT/templates/coursemanagement/comments.html
@@ -2,7 +2,7 @@
 {% load humanize %}
 {% block comments %}
 
-<div class="ui segment comments" id="comments_refresh" style="height:68vh;overflow:auto;overflow-x:hidden;">
+<div class="ui segment comments" id="comments_refresh" style="height:68vh; overflow:auto;overflow-x:hidden;">
     <h3 class="ui dividing header">Announcements</h3>
     {% for key, value in answers.items %}
     <div class="question" id="question{{key.pk}}">
@@ -54,7 +54,9 @@ <h3 class="ui dividing header">Announcements</h3>
         </div> -->
     </div>
     {% endfor %}
-    {% if Lecturer == 1%}
+    
+</div>
+{% if Lecturer == 1%}
     <form class="ui form" id="new" method="post" style="margin-bottom:10px">
         {% csrf_token %}
         <div class="field">
@@ -62,9 +64,7 @@ <h3 class="ui dividing header">Announcements</h3>
         </div>
         <input type="submit" class="ui blue submit button submit_new" data-pk="{{key.pk}}" name="submit" value="Send">
     </form>
-    {% endif %}
-</div>
-
+{% endif %}
 
 
 {% endblock %}
\ No newline at end of file
diff --git a/FusionIIIT/templates/coursemanagement/gradingscheme.html b/FusionIIIT/templates/coursemanagement/gradingscheme.html
index 87b76282a..b84ed0f42 100644
--- a/FusionIIIT/templates/coursemanagement/gradingscheme.html
+++ b/FusionIIIT/templates/coursemanagement/gradingscheme.html
@@ -7,7 +7,7 @@
 <div style="height:45em;overflow:auto;overflow-x:hidden;width:100%;">
     <h3 class="ui dividing header">Create Grading Scheme</h3>
 
-    <form class="ui form" id="gradingScheme_submit" method="post" action="/ocms/{{ curriculum.course_code }}/create_grading_scheme">
+    <form class="ui form" id="gradingScheme_submit" method="post" action="/ocms/{{ course.code }}/{{course.version}}/create_grading_scheme">
     {% csrf_token %}
 
 	<div style="overflow:auto;overflow-x:hidden; margin-right:0.75em;">
@@ -252,8 +252,13 @@ <h3 class="ui dividing header">Create Grading Scheme</h3>
         xhr.send(formData);
     }
 
-    // Attach submitForm function to the click event of the submit button
     document.getElementById("submit_gradingScheme").addEventListener("click", submitForm);
+
+    document.getElementById("submit_gradingScheme").addEventListener("click", function() {
+    setTimeout(function() {
+        location.reload();
+    }, 3000);
+});
 </script>
 
 
diff --git a/FusionIIIT/templates/coursemanagement/manageEval.html b/FusionIIIT/templates/coursemanagement/manageEval.html
index 0d1de246e..cddde7918 100644
--- a/FusionIIIT/templates/coursemanagement/manageEval.html
+++ b/FusionIIIT/templates/coursemanagement/manageEval.html
@@ -7,7 +7,7 @@
 <div style="height:45em;overflow:auto;overflow-x:hidden;width:100%;">
     <h3 class="ui dividing header">Manage Evaluations</h3>
 
-    <form class="ui form" id="manageEval" method="post" action="/ocms/{{ curriculum.course_code }}/submit_marks">
+    <form class="ui form" id="manageEval" method="post" action="/ocms/{{ course.code }}/{{course.version}}/submit_marks">
         {% csrf_token %}
         
         <div style="overflow-x:hidden; margin-top:15px; margin-right:0.75em;">
diff --git a/FusionIIIT/templates/coursemanagement/viewcourse.html b/FusionIIIT/templates/coursemanagement/viewcourse.html
index aa5c117b5..68287943c 100644
--- a/FusionIIIT/templates/coursemanagement/viewcourse.html
+++ b/FusionIIIT/templates/coursemanagement/viewcourse.html
@@ -30,7 +30,7 @@
 
 
             <div class="ui huge fluid vertical pointing menu" style="max-width: 320px;">
-              <h3 style="margin-left:15px; margin-top:10px;"> {{course.course_name}}  </h3>
+              <h3 style="margin-left:15px; margin-top:10px;"> {{course.name}}  </h3>
                 <a class="active item sidetab" data-tab="first" data-num="11">
                   Course Content
                   <i class="right floated chevron right icon"></i>
@@ -352,7 +352,7 @@ <h4 class="ui dividing header">Quizzes</h4>
                   </div>
                   {% else %}
                  
-                 <div class="ui active tab segment box" id="21" data-tab="submitassignment">
+                 <div class="ui active tab segment box" id="21" data-tab="submitassignment" style="height: 60vh;">
                   
                     <h4 class="ui dividing header">Assignments </h4>
                     
@@ -442,10 +442,10 @@ <h4 class="ui dividing header">Submitable Assignments </h4>
                             </div>
                         {% else %}
                         <div class="row" style="margin-left:20px">
-                            <h4 class="ui dividing header">{{course.course_name}}</h4>
+                            <h4 class="ui dividing header">{{course.name}}</h4>
 
                         </div>
-                        <div class="ui accordion styled row" style="display: block;">
+                        <div class="ui accordion styled row" style="display: block; height: 60vh;">
                           {% for module, slides in modules.items %}
                           <div class="title">
                             <i class="dropdown icon"></i>
@@ -489,7 +489,6 @@ <h4 class="ui dividing header">{{course.course_name}}</h4>
                             <div class="row">     
                               <div class="column">
                                 <button class="ui primary button" style="mae">
-                                  {{slide.document_url}}
                                  <a id='visualize' href="{{slide.document_url}}"style="color:white;">{{slide.document_name}}</a>
 
                                </button>
@@ -645,7 +644,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
         // alert(pk);
         $.ajax({
             type: 'POST',
-            url: '/ocms/{{curriculum.course_code}}/ajax_assess',
+            url: '/ocms/{{course.code}}/{{course.version}}/ajax_assess',
             data: {
                 'pk': pk,
                 'marks':element.value,
@@ -669,7 +668,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
         // alert(pk);
         $.ajax({
             type: 'POST',
-            url: '/ocms/{{curriculum.course_code}}/ajax_feedback',
+            url: '/ocms/{{course.code}}/{{course.version}}/ajax_feedback',
             data: {
                 'pk': pk,
                 'feedback':element.value,
@@ -692,7 +691,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
  
       $.ajax({
           type: 'POST',
-          url: '/ocms/{{curriculum.course_code}}/remove_bank',
+          url: '/ocms/{{course.code}}/remove_bank',
           data: {
               'pk': pk,
               'csrfmiddlewaretoken': csrf
@@ -722,7 +721,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
  
       $.ajax({
           type: 'POST',
-          url: '/ocms/{{curriculum.course_code}}/remove_topic',
+          url: '/ocms/{{course.code}}/remove_topic',
           data: {
               'pk': pk,
               'csrfmiddlewaretoken': csrf
@@ -786,7 +785,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
         var csrf = $('input[name=csrfmiddlewaretoken]').val();
         $.ajax({
             type: 'POST',
-            url: '/ocms/{{curriculum.course_code}}/remove_quiz',
+            url: '/ocms/{{course.code}}/remove_quiz',
             data: {
                 'pk': pk,
                 'csrfmiddlewaretoken': csrf
@@ -830,7 +829,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
         var number = list[2];
         $.ajax({
             type: 'POST',
-            url: '/ocms/{{curriculum.course_code}}/delete/',
+            url: '/ocms/{{course.code}}/{{course.version}}/delete/',
             data: {
                 'type': type,
                 'pk':pk,
@@ -989,7 +988,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
         if (question != "") {
             $.ajax({
                 type: 'POST',
-                url: '/ocms/{{curriculum.course_code}}/ajax_new',
+                url: '/ocms/{{course.code}}/{{course.version}}/ajax_new',
                 data: {
                     'question': question,
                     'csrfmiddlewaretoken': csrf
@@ -1026,7 +1025,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
         if (reply != "") {
           $.ajax({
             type:'POST',
-            url:'/ocms/{{curriculum.course_code}}/ajax_reply',
+            url:'/ocms/{{course.code}}/{{course.version}}/ajax_reply',
             data:{ 'question':pk,
                    'reply': reply,
                    'csrfmiddlewaretoken':csrf
@@ -1058,7 +1057,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
         if (reply != "") {
           $.ajax({
             type:'POST',
-            url:'/ocms/{{curriculum.course_code}}/ajax_reply',
+            url:'/ocms/{{course.code}}/{{course.version}}/ajax_reply',
             data:{ 'question':pk,'reply': reply,'csrfmiddlewaretoken':'{{ csrf_token }}'},
             success:function(data){
               $('#reply_n_'+pk).val("");
@@ -1102,7 +1101,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
           {
             $.ajax({
               type:'POST',
-              url:'/ocms/{{curriculum.course_code}}/ajax_remove',
+              url:'/ocms/{{coure.code}}/ajax_remove',
               data:{ 'question':pk,'csrfmiddlewaretoken':'{{ csrf_token }}'},
               success:function(data){
                 $('#comment'+pk).hide();
@@ -1122,7 +1121,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
           {
               $.ajax({
               type:'POST',
-              url:'/ocms/{{curriculum.course_code}}/ajax_remove',
+              url:'/ocms/{{course.code}}/{{course.version}}/ajax_remove',
               data:{ 'question':pk,'csrfmiddlewaretoken':'{{ csrf_token }}'},
               success:function(data){
                 $('#question'+pk).hide();
@@ -1139,7 +1138,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
         var pk = btn.getAttribute('data-pk');
         $.ajax({
           type:'POST',
-          url:'/ocms/{{curriculum.course_code}}/ajax_remove',
+          url:'/ocms/{{course.code}}/{{course.version}}/ajax_remove',
           data:{ 'question':pk,'csrfmiddlewaretoken':'{{ csrf_token }}'},
           success:function(data){
             btn.parentNode.parentNode.parentNode.style.display="none";
@@ -1155,7 +1154,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
         var pk=btn.getAttribute('data-pk');
         $.ajax({
           type:'POST',
-          url:'/ocms/{{curriculum.course_code}}/ajax_remove',
+          url:'/ocms/{{course.code}}/{{course.version}}/ajax_remove',
           data:{ 'question':pk,'csrfmiddlewaretoken':'{{ csrf_token }}'},
           success:function(data){
             btn.parentNode.parentNode.parentNode.parentNode.style.display="none";
@@ -1184,7 +1183,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
         });
         $('#load_submit_vid').show();
         $.ajax({
-            url: "/ocms/{{curriculum.course_code}}/add_video",
+            url: "/ocms/{{course.code}}/add_video",
             processData: false,
             contentType: false,
             type: 'POST',
@@ -1214,7 +1213,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
         });
         $('#load_submit_doc').show();
         $.ajax({
-            url: "/ocms/{{curriculum.course_code}}/add_documents",
+            url: "/ocms/{{course.code}}/{{course.version}}/add_documents",
             processData: false,
             contentType: false,
             type: 'POST',
@@ -1245,7 +1244,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
         });
         $('#load_att_doc').show();
         $.ajax({
-            url: "/ocms/{{curriculum.course_code}}/add_attendance",
+            url: "/ocms/{{course.code}}/{{course.version}}/add_attendance",
             processData: false,
             contentType: false,
             type: 'POST',
@@ -1274,7 +1273,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
     var formData = $('#module_form').serialize();
     $('#load_submit_module').show();
     $.ajax({
-        url: "/ocms/{{curriculum.course_code}}/add_modules",
+        url: "/ocms/{{course.code}}/{{course.version}}/add_modules",
         type: 'POST',
         data: formData,
         success: function(data) {
@@ -1304,7 +1303,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
         });
         $('#load_add_assignment').show();
         $.ajax({
-            url: "/ocms/{{curriculum.course_code}}/add_assignment",
+            url: "/ocms/{{course.code}}/{{course.version}}/add_assignment",
             processData: false,
             contentType: false,
             type: 'POST',
@@ -1336,7 +1335,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
         $('#load_submit_assign').show();
         data.append('assignment_topic',selectedValue);
         $.ajax({
-            url: "/ocms/{{curriculum.course_code}}/upload_assignment",
+            url: "/ocms/{{course.code}}/{{course.version}}/upload_assignment",
             processData: false,
             contentType: false,
             type: 'POST',
@@ -1409,7 +1408,7 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
         alert(pk);
         $.ajax({
             type: 'POST',
-            url: '/ocms/{{curriculum.course_code}}/edit_marks',
+            url: '/ocms/{{course.code}}/edit_marks',
             dataType : "json",
             data: {
                 'pk': pk,
diff --git a/FusionIIIT/templates/coursemanagement/viewperformance.html b/FusionIIIT/templates/coursemanagement/viewperformance.html
index 9e7bdc74c..fa3b027b6 100644
--- a/FusionIIIT/templates/coursemanagement/viewperformance.html
+++ b/FusionIIIT/templates/coursemanagement/viewperformance.html
@@ -11,7 +11,7 @@
 
 </div>
 <!-- Assignment -->
- <div class="ui bottom attached vptabdata active tab segment" id="assignmenttabdata" data-tab="assignment" >
+ <div class="ui bottom attached vptabdata active tab segment" id="assignmenttabdata" data-tab="assignment" {% if Lecturer is 0 %} style="height: 65vh;"{% endif %}>
   {% if Lecturer is 0 %}
     <h4>Results</h4>
     {% if assignment|length  %}
@@ -244,8 +244,8 @@ <h3>No quiz was conducted</h3>
         </table>
         
     </div>
-      
-   
+
+
 <div class="ui bottom attached tab vptabdata segment" id="attendancetabdata" data-tab="attendance">
   <!-- <p> Total Attendance = {{total_attendance}} </p>
 	<p> Total Present = {{present_attendance}} </p>