Index: lams_bb_integration/WEB-INF/bb-manifest.xml
===================================================================
diff -u -rc1dcc2fb17839727fa637150ed8fffc388d7616c -refced1f751a9f688a5f99a75cf6592120260428e
--- lams_bb_integration/WEB-INF/bb-manifest.xml	(.../bb-manifest.xml)	(revision c1dcc2fb17839727fa637150ed8fffc388d7616c)
+++ lams_bb_integration/WEB-INF/bb-manifest.xml	(.../bb-manifest.xml)	(revision efced1f751a9f688a5f99a75cf6592120260428e)
@@ -5,7 +5,7 @@
     <name value= "LAMS2 Module"/>
     <handle value= "lamscontent"/>
     <description value= "LAMS2 and Blackboard integration allows LAMS2 leaning designs to be managed and views in a Blackboard Environment."/>
-    <version value= "1.2.2"/>
+    <version value= "1.2.3"/>
     <requires>
       <bbversion value="9.1.0"/>
     </requires>
Index: lams_bb_integration/build.xml
===================================================================
diff -u -rd1bd46656c685991413555e26f4efe3a9c4db39f -refced1f751a9f688a5f99a75cf6592120260428e
--- lams_bb_integration/build.xml	(.../build.xml)	(revision d1bd46656c685991413555e26f4efe3a9c4db39f)
+++ lams_bb_integration/build.xml	(.../build.xml)	(revision efced1f751a9f688a5f99a75cf6592120260428e)
@@ -2,7 +2,7 @@
 <project default="package" name="LAMS/Blackboard Plugin" basedir="./">
 	<property name="project" value="BlackboardPlugin"/>
 	<property name="product" value="lams2-bb-plugin"/>
-	<property name="version" value="1.2.2"/>
+	<property name="version" value="1.2.3"/>
 
 	<property name="build" value="${basedir}/build"/>
 	<property name="build.classes" value="${build}/classes"/>
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GradebookServlet.java
===================================================================
diff -u -r8ee0de626969fdca9991edf123916a3381fff3f3 -refced1f751a9f688a5f99a75cf6592120260428e
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GradebookServlet.java	(.../GradebookServlet.java)	(revision 8ee0de626969fdca9991edf123916a3381fff3f3)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GradebookServlet.java	(.../GradebookServlet.java)	(revision efced1f751a9f688a5f99a75cf6592120260428e)
@@ -34,6 +34,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.text.DecimalFormat;
 import java.util.List;
+import java.util.Set;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -51,23 +52,22 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
+import blackboard.data.content.Content;
+import blackboard.data.content.CourseDocument;
 import blackboard.data.course.Course;
 import blackboard.data.course.CourseMembership;
 import blackboard.data.gradebook.Lineitem;
 import blackboard.data.gradebook.Score;
-import blackboard.data.gradebook.impl.Outcome;
-import blackboard.data.gradebook.impl.OutcomeDefinition.CalculationType;
-import blackboard.data.gradebook.impl.OutcomeDefinitionCategory;
-import blackboard.data.gradebook.impl.OutcomeDefinitionScale;
 import blackboard.data.user.User;
 import blackboard.persist.BbPersistenceManager;
+import blackboard.persist.Container;
+import blackboard.persist.Id;
 import blackboard.persist.KeyNotFoundException;
-import blackboard.persist.PersistenceException;
 import blackboard.persist.PkId;
+import blackboard.persist.content.ContentDbLoader;
 import blackboard.persist.course.CourseDbLoader;
 import blackboard.persist.course.CourseMembershipDbLoader;
 import blackboard.persist.gradebook.LineitemDbLoader;
-import blackboard.persist.gradebook.LineitemDbPersister;
 import blackboard.persist.gradebook.ScoreDbLoader;
 import blackboard.persist.gradebook.ScoreDbPersister;
 import blackboard.persist.user.UserDbLoader;
@@ -103,26 +103,52 @@
 	    String userName = request.getParameter(Constants.PARAM_USER_ID);
 	    String timeStamp = request.getParameter(Constants.PARAM_TIMESTAMP);
 	    String hash = request.getParameter(Constants.PARAM_HASH);
-	    String lessonIdStr = request.getParameter(Constants.PARAM_LESSON_ID);
+	    String lessonId = request.getParameter(Constants.PARAM_LESSON_ID);
 
-	    // check paramaeters
-	    if (userName == null || timeStamp == null || hash == null) {
+	    // check parameters
+	    if (userName == null || timeStamp == null || hash == null || lessonId == null) {
 		response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "missing expected parameters");
 		return;
 	    }
 
+	    //check user rights
 	    String secretKey = LamsPluginUtil.getSecretKey();
 	    String serverId = LamsPluginUtil.getServerId();
-
 	    if (!sha1(
 		    timeStamp.toLowerCase() + userName.toLowerCase() + serverId.toLowerCase()
 			    + secretKey.toLowerCase()).equals(hash)) {
 		response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "authentication failed");
 	    }
+	    
+	    //check if isGradebookcenter
+	    PortalExtraInfo pei = PortalUtil.loadPortalExtraInfo(null, null, "LamsStorage");
+	    ExtraInfo ei = pei.getExtraInfo();
+	    Set<String> internalLessonIds = ei.getKeys();
+	    String internalLessonId = null;
+	    for (String internalLessonIdIter : internalLessonIds) {
+		String externalLessonId = ei.getValue(internalLessonIdIter);
+		if (lessonId.equals(externalLessonId)) {
+		    internalLessonId = internalLessonIdIter;
+		    break;
+		}
+	    }
+	    
+	    // exit method as it was created in version prior to 1.2.1 and thus don't have lineitem
+	    if (internalLessonId == null) {
+	    	return;
+	    }
+	    
+	    // check if we need to store mark in Gradebook
+            BbPersistenceManager bbPm = BbServiceManager.getPersistenceService().getDbPersistenceManager();
+            Container bbContainer = bbPm.getContainer();
+            Id contentId = new PkId( bbContainer, CourseDocument.DATA_TYPE, internalLessonId );
+            ContentDbLoader courseDocumentLoader = (ContentDbLoader) bbPm.getLoader( ContentDbLoader.TYPE );
+            Content modifiedLesson = (Content)courseDocumentLoader.loadById( contentId );
+            if (!modifiedLesson.getIsDescribed()) {
+            	//isDescribed field is used for storing isGradecenter parameter and thus if it's false it means don't store mark to Gradecenter
+            	return;
+            }
 
-	    // get the persistence manager
-	    BbPersistenceManager bbPm = BbServiceManager.getPersistenceService().getDbPersistenceManager();
-
 	    // get user list, but no role info since there are no course info
 	    UserDbLoader userLoader = (UserDbLoader) bbPm.getLoader(UserDbLoader.TYPE);
 	    User user = userLoader.loadByUserName(userName);
@@ -136,7 +162,7 @@
 	    Document document = null;
 	    String serviceURL = serverAddr + "/services/xml/LessonManager?"
 		    + LamsSecurityUtil.generateAuthenticateParameters(ctx) + "&courseId="
-		    + "&method=toolOutputsUser&lsId=" + lessonIdStr + "&outputsUser="
+		    + "&method=toolOutputsUser&lsId=" + lessonId + "&outputsUser="
 		    + URLEncoder.encode(userName, "UTF8");
 	    
 	    URL url = new URL(serviceURL);
@@ -201,7 +227,7 @@
 		List<Lineitem> lineitems = lineitemLoader.loadByCourseId(userCourse.getId());
 
 		for (Lineitem lineitemIter : lineitems) {
-		    if (lineitemIter.getAssessmentId() != null && lineitemIter.getAssessmentId().equals(lessonIdStr)) {
+		    if (lineitemIter.getAssessmentId() != null && lineitemIter.getAssessmentId().equals(lessonId)) {
 			lineitem = lineitemIter;
 			break;
 		    }
Index: lams_bb_integration/web/modules/create.jsp
===================================================================
diff -u -r7ad1566649545d95c6bdfe73b2874f98e6006cd9 -refced1f751a9f688a5f99a75cf6592120260428e
--- lams_bb_integration/web/modules/create.jsp	(.../create.jsp)	(revision 7ad1566649545d95c6bdfe73b2874f98e6006cd9)
+++ lams_bb_integration/web/modules/create.jsp	(.../create.jsp)	(revision efced1f751a9f688a5f99a75cf6592120260428e)
@@ -27,7 +27,6 @@
 <bbNG:cssFile href="css/treeview.css" />
 <bbNG:cssFile href="css/folders.css" />
 <%
-    // SECURITY!
     // Authorise current user for Course Control Panel (automatic redirect)
     try{
         if (!PlugInUtil.authorizeForCourseControlPanel(request, response))
@@ -141,7 +140,6 @@
                     <input type="Radio" name="isGradecenter" value="false">No
                 </bbNG:dataElement>
 
-
                 <bbNG:dataElement label="Track number of views" labelFor="isTracked">
                     <input type="radio" name="isTracked" value="true">Yes
                     <input type="radio" name="isTracked" value="false" checked>No
Index: lams_bb_integration/web/modules/delete.jsp
===================================================================
diff -u -r6d7366cc28dad4b552e601d5d178996468178d1b -refced1f751a9f688a5f99a75cf6592120260428e
--- lams_bb_integration/web/modules/delete.jsp	(.../delete.jsp)	(revision 6d7366cc28dad4b552e601d5d178996468178d1b)
+++ lams_bb_integration/web/modules/delete.jsp	(.../delete.jsp)	(revision efced1f751a9f688a5f99a75cf6592120260428e)
@@ -36,7 +36,6 @@
 
 <bbNG:genericPage title="LAMS Options" ctxId="ctx">
 <%
-    // SECURITY!
 		// Authorise current user for Course Access (automatic redirect)
 		try {
 		    if (!PlugInUtil.authorizeForCourse(request, response))
@@ -77,8 +76,12 @@
 		    throw new ServletException("lineitem not found");
 		}
 
+		//delete lineitem (can't delete it simply doing linePersister.deleteById(lineitem.getId()) due to BB9 bug)
+		PkId lineitemPkId = (PkId) lineitem.getId();
+		String lineitemIdStr = "_" + lineitemPkId.getPk1() + "_" + lineitemPkId.getPk2();
+		Id lineitemId = bbPm.generateId(Lineitem.LINEITEM_DATA_TYPE, lineitemIdStr.trim());
 		LineitemDbPersister linePersister = (LineitemDbPersister) bbPm.getPersister(LineitemDbPersister.TYPE);
-		linePersister.deleteById(lineitem.getId());
+		linePersister.deleteById(lineitemId);
 %>
 
     <%-- Page Header --%>
Index: lams_bb_integration/web/modules/learnermonitor.jsp
===================================================================
diff -u -r945b2cfd06b7a6fa1c28ca66f09f43349fdb1169 -refced1f751a9f688a5f99a75cf6592120260428e
--- lams_bb_integration/web/modules/learnermonitor.jsp	(.../learnermonitor.jsp)	(revision 945b2cfd06b7a6fa1c28ca66f09f43349fdb1169)
+++ lams_bb_integration/web/modules/learnermonitor.jsp	(.../learnermonitor.jsp)	(revision efced1f751a9f688a5f99a75cf6592120260428e)
@@ -33,7 +33,6 @@
 
 <bbNG:genericPage title="LAMS Options" ctxId="ctx">
 <%
-    // SECURITY!
     // Authorise current user for Course Access (automatic redirect)
     try{
         if (!PlugInUtil.authorizeForCourse(request, response))
@@ -87,9 +86,29 @@
         PlugInUtil.sendAccessDeniedRedirect(request, response);
     }
     
+    //Get lessson's title and description
+    String contentIdStr = request.getParameter("content_id");
+    String title = "";
+    String description = "";
+    //contentId is available in versions after 1.2.3
+    if (contentIdStr != null) {
+    	
+        Container bbContainer = bbPm.getContainer();
+        Id contentId = new PkId( bbContainer, CourseDocument.DATA_TYPE, request.getParameter("content_id") );
+        ContentDbLoader courseDocumentLoader = (ContentDbLoader) bbPm.getLoader( ContentDbLoader.TYPE );
+        Content courseDoc = (Content)courseDocumentLoader.loadById( contentId );
+        
+        title = courseDoc.getTitle();
+        description = courseDoc.getBody().getText();
+    } else {
+    
+    	title = request.getParameter("title");
+    	description = request.getParameter("description");
+    }
+
+    //display learning design image
     String strIsDisplayDesignImage = request.getParameter("isDisplayDesignImage");
     boolean isDisplayDesignImage = "true".equals(strIsDisplayDesignImage)?true:false;
-    
     String learningDesignImageUrl = "";
     if (isDisplayDesignImage) {
 		String strLearningDesignId = request.getParameter("ldid").trim();
@@ -111,7 +130,6 @@
 		    //no score availalbe
 		}
 	}
-
     boolean isScoreAvailable = (current_score != null);
 %>
 
@@ -122,7 +140,7 @@
 
     <%-- Page Header --%>
     <bbNG:pageHeader>    	
-        <bbNG:pageTitleBar title="LAMS Options"/>
+        <bbNG:pageTitleBar title="<%=title%>"/>
     </bbNG:pageHeader>
 
     <%-- Action Control Bar --%>
@@ -134,15 +152,9 @@
         <bbNG:actionButton id="cancel" url="javascript:back();" title="Cancel" primary="false"/>                        <%-- Cancel (Go Back) --%>
     </bbNG:actionControlBar>
     
-    <% if(request.getParameter("title") != null) { %>
-	    <h2>
-	    	<%=request.getParameter("title")%>
-	    </h2>
-    <% } %>
-    
-    <% if(request.getParameter("description") != null) { %>
+    <% if((description != "") && (description != null)) { %>
 	    <h4> 
-	    	<%=request.getParameter("description")%> 
+	    	<%=description%> 
 	    </h4>
     <% } %>
     
@@ -157,7 +169,6 @@
    			You have completed this lesson.
    		</div>
     <% } %>
-    
 
     <bbNG:jsBlock>
         <script language="JavaScript" type="text/javascript">
Index: lams_bb_integration/web/modules/modify.jsp
===================================================================
diff -u -r6d7366cc28dad4b552e601d5d178996468178d1b -refced1f751a9f688a5f99a75cf6592120260428e
--- lams_bb_integration/web/modules/modify.jsp	(.../modify.jsp)	(revision 6d7366cc28dad4b552e601d5d178996468178d1b)
+++ lams_bb_integration/web/modules/modify.jsp	(.../modify.jsp)	(revision efced1f751a9f688a5f99a75cf6592120260428e)
@@ -34,7 +34,6 @@
 <%
     String NOT_AVAILABLE = "<i>Item is not available.</i><br>";
 
-    // SECURITY!
     // Authorise current user for Course Control Panel (automatic redirect)
     try{
         if (!PlugInUtil.authorizeForCourseControlPanel(request, response))
@@ -43,14 +42,10 @@
         throw new RuntimeException(e);
     }
 
-    // Retrieve the Db persistence manager from the persistence service
-    BbPersistenceManager bbPm = BbServiceManager.getPersistenceService().getDbPersistenceManager();    
-    
-    // Get the content ID for this item 
+ 	// Get the Course Document (Lams Lesson)
+    BbPersistenceManager bbPm = BbServiceManager.getPersistenceService().getDbPersistenceManager();
     Container bbContainer = bbPm.getContainer();
-    Id contentId = new PkId( bbContainer, CourseDocument.DATA_TYPE, request.getParameter("content_id") );    
-    
-    // Load the Course Document (Lams Lesson)
+    Id contentId = new PkId( bbContainer, CourseDocument.DATA_TYPE, request.getParameter("content_id") );
     ContentDbLoader courseDocumentLoader = (ContentDbLoader) bbPm.getLoader( ContentDbLoader.TYPE );
     Content courseDoc = (Content)courseDocumentLoader.loadById( contentId );
 
@@ -98,6 +93,11 @@
                     <input type="Radio" name="isAvailable" value="false" <%=(courseDoc.getIsAvailable())?"":"checked"%>>No
                 </bbNG:dataElement>
                 
+                <bbNG:dataElement label="Do you want to add a mark/completion column in Gradecenter?" labelFor="isGradecenter">
+                    <input type="Radio" name="isGradecenter" value="true" <%=(courseDoc.getIsDescribed())?"checked":""%>>Yes
+                    <input type="Radio" name="isGradecenter" value="false" <%=(courseDoc.getIsDescribed())?"":"checked"%>>No
+                </bbNG:dataElement>                
+                
                 <bbNG:dataElement label="Track number of views">
                     <input type="radio" name="isTracked" value="true" <%=(courseDoc.getIsTracked())?"checked":""%>>Yes
                     <input type="radio" name="isTracked" value="false" <%=(courseDoc.getIsTracked())?"":"checked"%>>No
Index: lams_bb_integration/web/modules/modify_proc.jsp
===================================================================
diff -u -r6d7366cc28dad4b552e601d5d178996468178d1b -refced1f751a9f688a5f99a75cf6592120260428e
--- lams_bb_integration/web/modules/modify_proc.jsp	(.../modify_proc.jsp)	(revision 6d7366cc28dad4b552e601d5d178996468178d1b)
+++ lams_bb_integration/web/modules/modify_proc.jsp	(.../modify_proc.jsp)	(revision efced1f751a9f688a5f99a75cf6592120260428e)
@@ -31,7 +31,6 @@
 <bbNG:genericPage title="Modify A LAMS Lesson" ctxId="ctx">
   
     <%
-        // SECURITY!
         // Authorise current user for Course Control Panel (automatic redirect)
         try{
             if (!PlugInUtil.authorizeForCourseControlPanel(request, response))
@@ -59,8 +58,10 @@
         FormattedText description = new FormattedText(strDescription, FormattedText.Type.HTML);
         
         String strIsAvailable = request.getParameter("isAvailable");
+        String strIsGradecenter = request.getParameter("isGradecenter");
         String strIsTracked = request.getParameter("isTracked");
         boolean isAvailable = strIsAvailable.equals("true")?true:false;
+        boolean isGradecenter = strIsGradecenter.equals("true")?true:false;
         boolean isTracked = strIsTracked.equals("true")?true:false;
         
         String strStartDate = request.getParameter("lessonAvailability_start_datetime");
@@ -77,6 +78,7 @@
         // Set LAMS content data in Blackboard
         modifiedLesson.setTitle(strTitle);
         modifiedLesson.setIsAvailable(isAvailable);
+        modifiedLesson.setIsDescribed(isGradecenter);//isDescribed field is used for storing isGradecenter parameter
         modifiedLesson.setIsTracked(isTracked);
         modifiedLesson.setBody(description);
     
Index: lams_bb_integration/web/modules/preview.jsp
===================================================================
diff -u -r6d7366cc28dad4b552e601d5d178996468178d1b -refced1f751a9f688a5f99a75cf6592120260428e
--- lams_bb_integration/web/modules/preview.jsp	(.../preview.jsp)	(revision 6d7366cc28dad4b552e601d5d178996468178d1b)
+++ lams_bb_integration/web/modules/preview.jsp	(.../preview.jsp)	(revision efced1f751a9f688a5f99a75cf6592120260428e)
@@ -41,7 +41,6 @@
 <bbNG:genericPage title="LAMS Learning Activity Management System" ctxId="ctx">
 
     <%
-        // SECURITY!
         // Authorise current user for Course Control Panel (automatic redirect)
         try{
             if (!PlugInUtil.authorizeForCourseControlPanel(request, response))
Index: lams_bb_integration/web/modules/start_lesson_proc.jsp
===================================================================
diff -u -r7ad1566649545d95c6bdfe73b2874f98e6006cd9 -refced1f751a9f688a5f99a75cf6592120260428e
--- lams_bb_integration/web/modules/start_lesson_proc.jsp	(.../start_lesson_proc.jsp)	(revision 7ad1566649545d95c6bdfe73b2874f98e6006cd9)
+++ lams_bb_integration/web/modules/start_lesson_proc.jsp	(.../start_lesson_proc.jsp)	(revision efced1f751a9f688a5f99a75cf6592120260428e)
@@ -36,28 +36,18 @@
 <%@ page import="org.lamsfoundation.ld.integration.blackboard.LamsPluginUtil"%>
 <%@ page import="org.lamsfoundation.ld.integration.Constants" %>
 <%@ page import="blackboard.portal.data.*" %>
+<%@ page import="blackboard.data.content.ExternalLink" %>
 <%@ page import="blackboard.portal.servlet.PortalUtil" %>
 <%@ page import="blackboard.persist.PersistenceException" %>
 <%@ page errorPage="/error.jsp"%>
 <%@ taglib uri="/bbNG" prefix="bbNG"%>
 
 <bbNG:genericPage title="LAMS Learning Activity Management System" ctxId="ctx">
 
-       <%-- Set the new LAMS Lesson Content Object --%>
-<%
-// Note: Following is the original class used for the content creation. However, it appears to cause a security problem and users need to click thrice instead of twice to get to the item.
-// Change Part 1
-// Comment out the jsp tags.
-/* **
-    <jsp:useBean id="newLesson" scope="page" class="blackboard.data.content.CourseDocument"/>
-    <jsp:setProperty name="newLesson" property="title"/>
-    <jsp:setProperty name="newLesson" property="isAvailable"/>
-    <jsp:setProperty name="newLesson" property="isTracked"/>
-** */
-	blackboard.data.content.ExternalLink newLesson = new blackboard.data.content.ExternalLink();
-%>
     <%
-        // SECURITY!
+    	//Set the new LAMS Lesson Content Object
+    	ExternalLink newLesson = new blackboard.data.content.ExternalLink();
+    
         // Authorise current user for Course Control Panel (automatic redirect)
         try{
             if (!PlugInUtil.authorizeForCourseControlPanel(request, response))
@@ -66,7 +56,6 @@
             throw new RuntimeException(e);
         }
 
-
 		// Retrieve the Db persistence manager from the persistence service
         BbPersistenceManager bbPm = BbServiceManager.getPersistenceService().getDbPersistenceManager();
         ContentDbPersister contentPersister = (ContentDbPersister) bbPm.getPersister( ContentDbPersister.TYPE );
@@ -94,7 +83,6 @@
 
         String strIsAvailable = request.getParameter("isAvailable");
         String strIsGradecenter = request.getParameter("isGradecenter");
-
         String strIsTracked = request.getParameter("isTracked");
         boolean isAvailable = strIsAvailable.equals("true")?true:false;
         boolean isGradecenter = strIsGradecenter.equals("true")?true:false;
@@ -113,23 +101,36 @@
         String strStartDateCheckbox = request.getParameter("lessonAvailability_start_checkbox");
         String strEndDateCheckbox = request.getParameter("lessonAvailability_end_checkbox");
 
+	    // Set Availability Dates
+	    // Start Date
+	    if (strStartDateCheckbox != null){
+	        if (strStartDateCheckbox.equals("1")){
+	            newLesson.setStartDate(startDate);
+	        }
+	    }
+	    // End Date
+	    if (strEndDateCheckbox != null){
+	        if (strEndDateCheckbox.equals("1")){
+	            newLesson.setEndDate(endDate);
+	        }
+	    }
+
         // Set the New LAMS Lesson content data (in Blackboard)
         newLesson.setTitle(strTitle);
 		newLesson.setIsAvailable(isAvailable);
+		newLesson.setIsDescribed(isGradecenter);//isDescribed field is used for storing isGradecenter parameter
         newLesson.setIsTracked(isTracked);
         newLesson.setAllowGuests(false);
-// Change Part 2
-//        newLesson.setContentHandler(LamsPluginUtil.CONTENT_HANDLE);
-        newLesson.setLaunchInNewWindow(true);
+        newLesson.setContentHandler(LamsPluginUtil.CONTENT_HANDLE);
+        //newLesson.setLaunchInNewWindow(true);
 
         newLesson.setCourseId(courseId);
         newLesson.setParentId(folderId);
 
         newLesson.setRenderType(Content.RenderType.URL);
         newLesson.setBody(description);
 
-        // Start the Lesson in LAMS (via Webservices)
-        // Capture the lesson ID
+        // Start the Lesson in LAMS (via Webservices) and capture the lesson ID
         String lessonIdStr = null;
         try{
             long lessonId = LamsSecurityUtil.startLesson(ctx, ldId, strTitle, strDescription, false);
@@ -143,102 +144,87 @@
         } catch (Exception e){
             throw new ServletException(e.getMessage(), e);
         }
+        newLesson.setLinkRef(lessonIdStr);
 
+	    //Persist the New Lesson Object in Blackboard
+	    ContentDbPersister persister= (ContentDbPersister) bbPm.getPersister( ContentDbPersister.TYPE );
+	    persister.persist( newLesson );
 	
+		//Create new Gradebook column for current lesson
         Lineitem lineitem = new Lineitem();
-	if (isGradecenter) {
-        //Create new Gradebook column for current lesson
-	    lineitem.setCourseId(courseId);
-	    lineitem.setName(strTitle);
-	    lineitem.setPointsPossible(Constants.GRADEBOOK_POINTS_POSSIBLE);
-	    lineitem.setType(Constants.GRADEBOOK_LINEITEM_TYPE);
-	    lineitem.setIsAvailable(true);
-	    lineitem.setDateAdded();
-	    lineitem.setAssessmentLocation( Lineitem.AssessmentLocation.EXTERNAL );
-	    lineitem.setAssessmentId(lessonIdStr, Lineitem.AssessmentLocation.EXTERNAL);
-		lineitem.validate();
-	    LineitemDbPersister linePersister= (LineitemDbPersister) bbPm.getPersister( LineitemDbPersister.TYPE );
-	    linePersister.persist(lineitem);
+		if (isGradecenter) {
+		    lineitem.setCourseId(courseId);
+		    lineitem.setName(strTitle);
+		    lineitem.setPointsPossible(Constants.GRADEBOOK_POINTS_POSSIBLE);
+		    lineitem.setType(Constants.GRADEBOOK_LINEITEM_TYPE);
+		    lineitem.setIsAvailable(true);
+		    lineitem.setDateAdded();
+		    lineitem.setAssessmentLocation( Lineitem.AssessmentLocation.EXTERNAL );
+		    lineitem.setAssessmentId(lessonIdStr, Lineitem.AssessmentLocation.EXTERNAL);
+			lineitem.validate();
+		    LineitemDbPersister linePersister= (LineitemDbPersister) bbPm.getPersister( LineitemDbPersister.TYPE );
+		    linePersister.persist(lineitem);
+	
+		    OutcomeDefinitionDbPersister ocdPersister = (OutcomeDefinitionDbPersister)bbPm.getPersister(OutcomeDefinitionDbPersister.TYPE);
+		    OutcomeDefinition ocd = lineitem.getOutcomeDefinition();
+		    ocd.setCourseId(courseId);
+		    ocd.setPosition(1);	
+	
+		    OutcomeDefinitionScaleDbLoader ods2Loader = (OutcomeDefinitionScaleDbLoader)bbPm.getLoader(OutcomeDefinitionScaleDbLoader.TYPE);
+		    OutcomeDefinitionScaleDbPersister uutcomeDefinitionScaleDbPersister = (OutcomeDefinitionScaleDbPersister)bbPm.getPersister(OutcomeDefinitionScaleDbPersister.TYPE);
+	
+		    boolean hasLessonScoreOutputs = LamsSecurityUtil.hasLessonScoreOutputs(ctx);
+		    OutcomeDefinitionScale ods;
+		    if (hasLessonScoreOutputs) {
+				ods = ods2Loader.loadByCourseIdAndTitle(courseId,OutcomeDefinitionScale.SCORE);
+				ods.setNumericScale(true);
+				ods.setPercentageScale(true);
+				ocd.setScorable(true);
+		    } else {
+				ods = ods2Loader.loadByCourseIdAndTitle(courseId,OutcomeDefinitionScale.COMPLETE_INCOMPLETE);
+				ods.setNumericScale(false);
+				ocd.setScorable(false);
+		    }
+	
+		    uutcomeDefinitionScaleDbPersister.persist(ods);
+		    ocd.setScale(ods);
+		    ocdPersister.persist(ocd);
+		}
+		
+		//Construct new lesson id
+		PkId newLessonPkId = (PkId) newLesson.getId();
+		String newLessonIdStr = "_" + newLessonPkId.getPk1() + "_" + newLessonPkId.getPk2();
 
-	    OutcomeDefinitionDbPersister ocdPersister = (OutcomeDefinitionDbPersister)bbPm.getPersister(OutcomeDefinitionDbPersister.TYPE);
-	    OutcomeDefinition ocd = lineitem.getOutcomeDefinition();
-	    ocd.setCourseId(courseId);
-	    ocd.setPosition(1);
+		// Add port to the url if the port is in the blackboard url.
+		int bbport = request.getServerPort();
+		String bbportstr = bbport != 0 ? ":" + bbport : "";
 
+		//Build and set the content URL
+		String contentUrl = request.getScheme()
+			+ "://" +
+			request.getServerName() +
+			bbportstr +
+			request.getContextPath() +
+			"/modules/learnermonitor.jsp?lsid=" + lessonIdStr +
+			"&course_id=" + request.getParameter("course_id") +
+			"&content_id=" + newLessonIdStr +
+			"&ldid=" + ldId + 
+			"&isDisplayDesignImage=" + isDisplayDesignImage;
 
-	    OutcomeDefinitionScaleDbLoader ods2Loader = (OutcomeDefinitionScaleDbLoader)bbPm.getLoader(OutcomeDefinitionScaleDbLoader.TYPE);
-	    OutcomeDefinitionScaleDbPersister uutcomeDefinitionScaleDbPersister = (OutcomeDefinitionScaleDbPersister)bbPm.getPersister(OutcomeDefinitionScaleDbPersister.TYPE);
+		// Add lineitemid to the url
+		if (isGradecenter) {
+			PkId lineitemPkId = (PkId) lineitem.getId();
+			String lineitemKeyId = "_" + lineitemPkId.getPk1() + "_" + lineitemPkId.getPk2();
+		 	contentUrl += "&lineitemid=" + lineitemKeyId;
+		}
 
-	    boolean hasLessonScoreOutputs = LamsSecurityUtil.hasLessonScoreOutputs(ctx);
-	    OutcomeDefinitionScale ods;
-	    if (hasLessonScoreOutputs) {
-			ods = ods2Loader.loadByCourseIdAndTitle(courseId,OutcomeDefinitionScale.SCORE);
-			ods.setNumericScale(true);
-			ods.setPercentageScale(true);
-			ocd.setScorable(true);
-	    } else {
-			ods = ods2Loader.loadByCourseIdAndTitle(courseId,OutcomeDefinitionScale.COMPLETE_INCOMPLETE);
-			ods.setNumericScale(false);
-			ocd.setScorable(false);
-	    }
+		newLesson.setUrl(contentUrl);
+		persister.persist(newLesson);
 
-	    uutcomeDefinitionScaleDbPersister.persist(ods);
-	    ocd.setScale(ods);
-	    ocdPersister.persist(ocd);
-	}
-
-
-
-	    // Add port to the url if the port is in the blackboard url.
-	    int bbport = request.getServerPort();
-	    String bbportstr = bbport != 0 ? ":" + bbport : "";
-
-// Change Part 3
-	    //Build and set the content URL
-	    String contentUrl = request.getScheme()
-	        + "://" +
-	        request.getServerName() +
-	        bbportstr +
-	        request.getContextPath() +
-	        "/modules/learnermonitor.jsp?lsid=" + lessonIdStr +
-	        "&course_id=" + request.getParameter("course_id") +
-	        "&ldid=" + ldId + "&isDisplayDesignImage=" + isDisplayDesignImage + "&title=" + URLEncoder.encode(strTitle);
-
-	    if (isGradecenter) {
-
- 		contentUrl += "&lineitemid=" + lineitem.getId();
-
-	    }
-
-	        //+ "&description=" + URLEncoder.encode(strDescription);
-
-	    newLesson.setUrl(contentUrl);
-	    newLesson.setLinkRef(lessonIdStr);
-
-	    // Set Availability Dates
-	    // Start Date
-	    if (strStartDateCheckbox != null){
-	        if (strStartDateCheckbox.equals("1")){
-	            newLesson.setStartDate(startDate);
-	        }
-	    }
-	    // End Date
-	    if (strEndDateCheckbox != null){
-	        if (strEndDateCheckbox.equals("1")){
-	            newLesson.setEndDate(endDate);
-	        }
-	    }
-
-	    //Persist the New Lesson Object in Blackboard
-	    ContentDbPersister persister= (ContentDbPersister) bbPm.getPersister( ContentDbPersister.TYPE );
-	    persister.persist( newLesson );
-
-	    //store internalContentId -> externalContentId. This is required for lesson and according lineitem removal (see delete.jsp)
+		//store internalContentId -> externalContentId. This is required for lesson and according lineitem removal (see delete.jsp)
 		PortalExtraInfo pei = PortalUtil.loadPortalExtraInfo(null, null, "LamsStorage");
 		ExtraInfo ei = pei.getExtraInfo();
-		PkId newLessonPkId = (PkId) newLesson.getId();
-	    String newLessonKeyId = "_" + newLessonPkId.getPk1() + "_" + newLessonPkId.getPk2();
-		ei.setValue(newLessonKeyId, lessonIdStr);
+		ei.setValue(newLessonIdStr, lessonIdStr);
 		PortalUtil.savePortalExtraInfo(pei);
 
         String strReturnUrl = PlugInUtil.getEditableContentReturnURL(newLesson.getParentId(), courseId);