Index: moodle/mod/lamslesson/lib.php
===================================================================
diff -u -r0ef795fd4bdb5b139a36e0fb45b3fedfc17f6bc5 -r273e0709e68cb41df7fe41f1be07add6f25f69c6
--- moodle/mod/lamslesson/lib.php	(.../lib.php)	(revision 0ef795fd4bdb5b139a36e0fb45b3fedfc17f6bc5)
+++ moodle/mod/lamslesson/lib.php	(.../lib.php)	(revision 273e0709e68cb41df7fe41f1be07add6f25f69c6)
@@ -499,7 +499,8 @@
   $monitorlnamestr = '';
   $monitoremailstr = '';
 
-  $context = get_context_instance(CONTEXT_MODULE, $form->coursemodule);
+  // $context = get_context_instance(CONTEXT_MODULE, $form->coursemodule);
+  $context = context_module::instance($form->coursemodule);
 	
   if (!$form->groupingid) {  // get all course members
     $userids = lamslesson_get_course_userids($form->coursemodule, $context);
@@ -754,14 +755,17 @@
 		if (! $cm = get_coursemodule_from_instance('lamslesson', $lamslesson->id, $lamslesson->course)) {
 			error('Course Module ID was incorrect');
 		}
-		$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+		// $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+		$context = context_module::instance($cm->id);
 	}
 	
 	// we are looking for all users assigned in this context or higher
 	if ($usercontexts = $context->get_parent_context_ids($context)) {
 		$listofcontexts = '('.implode(',', $usercontexts).')';
 	} else {
-		$sitecontext = get_context_instance(CONTEXT_SYSTEM);
+		// $sitecontext = get_context_instance(CONTEXT_SYSTEM);
+		$sitecontext = context_system::instance();
+
 		$listofcontexts = '('.$sitecontext->id.')'; // must be site
 	}
 	$sql = "SELECT u.id
Index: moodle/mod/lamslesson/mod_form.php
===================================================================
diff -u -r838dc1f2f02215e3ee88c3030fb2b911db52a957 -r273e0709e68cb41df7fe41f1be07add6f25f69c6
--- moodle/mod/lamslesson/mod_form.php	(.../mod_form.php)	(revision 838dc1f2f02215e3ee88c3030fb2b911db52a957)
+++ moodle/mod/lamslesson/mod_form.php	(.../mod_form.php)	(revision 273e0709e68cb41df7fe41f1be07add6f25f69c6)
@@ -63,15 +63,18 @@
         $mform->addRule('name', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
         $mform->addHelpButton('name', 'lamslessonname', 'lamslesson');
 
-    /// Adding the standard "intro" and "introformat" fields
-        $this->add_intro_editor();
+    // Adding the standard "intro" and "introformat" fields
+        $this->standard_intro_elements();
 
 //-------------------------------------------------------------------------------
     /// Adding the rest of lamslesson settings, spreeading all them into this fieldset
     /// or adding more fieldsets ('header' elements) if needed for better logic
 
     // Set needed vars
-	$context = get_context_instance(CONTEXT_COURSE, $COURSE->id);
+		//$context = get_context_instance(CONTEXT_COURSE, $COURSE->id); 
+		// using context_course now instead
+	$context = context_course::instance($COURSE->id);
+		
 	$canmanage = has_capability('mod/lamslesson:manage', $context);
 
     //-- Open Author & Preview URL buttons
Index: moodle/mod/lamslesson/preview.php
===================================================================
diff -u -r14c3743d2e7b7013f29247abb8091f7248f88aa0 -r273e0709e68cb41df7fe41f1be07add6f25f69c6
--- moodle/mod/lamslesson/preview.php	(.../preview.php)	(revision 14c3743d2e7b7013f29247abb8091f7248f88aa0)
+++ moodle/mod/lamslesson/preview.php	(.../preview.php)	(revision 273e0709e68cb41df7fe41f1be07add6f25f69c6)
@@ -40,7 +40,8 @@
 
 // Check permissions and capabilities:
 
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
+// $context = get_context_instance(CONTEXT_COURSE, $course->id);
+$context = context_course::instance($course->id);
 
 $canmanage = has_capability('mod/lamslesson:manage', $context);
 if ($canmanage) {
Index: moodle/mod/lamslesson/view.php
===================================================================
diff -u -r0ef795fd4bdb5b139a36e0fb45b3fedfc17f6bc5 -r273e0709e68cb41df7fe41f1be07add6f25f69c6
--- moodle/mod/lamslesson/view.php	(.../view.php)	(revision 0ef795fd4bdb5b139a36e0fb45b3fedfc17f6bc5)
+++ moodle/mod/lamslesson/view.php	(.../view.php)	(revision 273e0709e68cb41df7fe41f1be07add6f25f69c6)
@@ -47,7 +47,7 @@
 
 require_login($course, true, $cm);
 
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+// $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 $context = context_module::instance($cm->id);
 
 // Trigger module viewed event.