Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
===================================================================
diff -u -r91528cfc96819fd14286f96b386df6f1f0955791 -r5e1779fdea3b14515d2eeb9079168e81b6defa81
--- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java	(.../TBLTemplateController.java)	(revision 91528cfc96819fd14286f96b386df6f1f0955791)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java	(.../TBLTemplateController.java)	(revision 5e1779fdea3b14515d2eeb9079168e81b6defa81)
@@ -234,7 +234,7 @@
 		if (applicationExercise.assessments == null) {
 		    // it is doKumaran type AE
 		    Long aetoolContentId = createDokumaranToolContent(userDTO, applicationExerciseTitle,
-			    applicationExercise.dokuDescription, applicationExercise.dokuInstructions, false,
+			    applicationExercise.description, applicationExercise.dokuInstructions, false,
 			    applicationExercise.dokuGalleryWalkEnabled, applicationExercise.dokuGalleryWalkReadOnly,
 			    applicationExercise.dokuGalleryWalkInstructions, null);
 		    activities.add(createDokumaranActivity(maxUIID, order++, currentActivityPosition, aetoolContentId,
@@ -248,8 +248,11 @@
 		    }
 
 		    Long aetoolContentId = authoringService.createTblAssessmentToolContent(userDTO,
-			    applicationExerciseTitle, data.getText("boilerplate.ae.instructions"), null, true, true,
-			    false, true, true, true, questionsJSONArray);
+			    applicationExerciseTitle,
+			    StringUtils.isBlank(applicationExercise.description)
+				    ? data.getText("boilerplate.ae.instructions")
+				    : applicationExercise.description,
+			    null, true, true, false, true, true, true, questionsJSONArray);
 		    activities.add(createAssessmentActivity(maxUIID, order++, currentActivityPosition, aetoolContentId,
 			    data.contentFolderID, groupingUIID, null, null, applicationExerciseTitle));
 		}
@@ -333,7 +336,7 @@
 	String title = "Fix me";
 	SortedMap<Integer, Assessment> assessments;
 
-	String dokuDescription;
+	String description;
 	String dokuInstructions;
 	boolean dokuGalleryWalkEnabled;
 	boolean dokuGalleryWalkReadOnly;
@@ -536,7 +539,7 @@
 		String dateTimeString = WebUtil.readStrParam(request, dateField);
 		if (dateTimeString != null) {
 		    try {
-			Long offset = TBLTemplateController.LESSON_SCHEDULING_DATETIME_FORMAT.parse(dateTimeString)
+			long offset = TBLTemplateController.LESSON_SCHEDULING_DATETIME_FORMAT.parse(dateTimeString)
 				.getTime() - this.startTime;
 			return offset > 0 ? offset / 60000 : 0; // from ms to minutes
 		    } catch (ParseException e) {
@@ -555,24 +558,26 @@
 		String appexDiv = "divappex" + i;
 		AppExData newAppex = new AppExData();
 		newAppex.title = WebUtil.readStrParam(request, appexDiv + "Title", true);
-		newAppex.dokuDescription = WebUtil.readStrParam(request, appexDiv + "dokuDescription", true);
-		newAppex.dokuInstructions = WebUtil.readStrParam(request, appexDiv + "dokuInstructions", true);
+		newAppex.description = WebUtil.readStrParam(request, appexDiv + "Description", true);
 
-		// if doKumaran data is present, it is doku type
-		// otherwise either it is Assessment type or the AE got deleted
-		if (StringUtils.isBlank(newAppex.dokuDescription) && StringUtils.isBlank(newAppex.dokuInstructions)) {
-		    newAppex.assessments = processAssessments(request, i, newAppex.title);
-		} else {
+		boolean isDoku = WebUtil.readBooleanParam(request, appexDiv + "IsDoku", false);
+
+		if (isDoku) {
+		    newAppex.dokuInstructions = WebUtil.readStrParam(request, appexDiv + "dokuInstructions", true);
 		    newAppex.dokuGalleryWalkEnabled = WebUtil.readBooleanParam(request,
 			    appexDiv + "dokuGalleryWalkEnabled", false);
 		    newAppex.dokuGalleryWalkReadOnly = WebUtil.readBooleanParam(request,
 			    appexDiv + "dokuGalleryWalkReadOnly", false);
 		    newAppex.dokuGalleryWalkInstructions = WebUtil.readStrParam(request,
 			    appexDiv + "dokuGalleryWalkInstructions", true);
+		} else {
+		    newAppex.assessments = processAssessments(request, i, newAppex.title);
 		}
 
-		if (newAppex.assessments != null || StringUtils.isNotBlank(newAppex.dokuDescription)
-			|| StringUtils.isNotBlank(newAppex.dokuInstructions)) {
+		if (isDoku
+			? StringUtils.isNotBlank(newAppex.description)
+				|| StringUtils.isNotBlank(newAppex.dokuInstructions)
+			: newAppex.assessments != null) {
 		    newAppex.useNoticeboard = WebUtil.readBooleanParam(request, appexDiv + "NB", false);
 		    if (newAppex.useNoticeboard) {
 			newAppex.noticeboardInstructions = getTrimmedString(request, appexDiv + "NBEntry", true);
@@ -817,7 +822,7 @@
 	    }
 	    for (Map.Entry<Integer, AppExData> appExEntry : applicationExercises.entrySet()) {
 		AppExData appEx = appExEntry.getValue();
-		if (StringUtils.isBlank(appEx.dokuDescription) && StringUtils.isBlank(appEx.dokuInstructions)
+		if (StringUtils.isBlank(appEx.description) && StringUtils.isBlank(appEx.dokuInstructions)
 			&& (appEx.assessments == null)) {
 		    addValidationErrorMessage("authoring.error.application.exercise.num",
 			    new String[] { "\"" + appEx.title + "\"" }, applicationExerciseErrors);
Index: lams_central/web/authoring/template/tbl/appexAssessment.jsp
===================================================================
diff -u -r766973f2a21ca668667914744418c4c25dc031e3 -r5e1779fdea3b14515d2eeb9079168e81b6defa81
--- lams_central/web/authoring/template/tbl/appexAssessment.jsp	(.../appexAssessment.jsp)	(revision 766973f2a21ca668667914744418c4c25dc031e3)
+++ lams_central/web/authoring/template/tbl/appexAssessment.jsp	(.../appexAssessment.jsp)	(revision 5e1779fdea3b14515d2eeb9079168e81b6defa81)
@@ -126,6 +126,16 @@
 		
 				<div id="advanced-settings-ae-${appexNumber}-collapse" class="panel-body panel-collapse collapse" role="tabpanel" 
 					 aria-labelledby="#advanced-settings-ae-${appexNumber}-heading">
+					 
+					<div class="form-group">
+					    <label for="divappex${param.appexNumber}Description">
+							<fmt:message key="authoring.label.application.exercise.doku.description" />&nbsp;
+							<i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right" title=""
+							   data-original-title="<fmt:message key="authoring.label.application.exercise.doku.description.tooltip"/>"></i>
+						</label>
+					    <lams:CKEditor id="divappex${appexNumber}Description" value="" contentFolderID="${contentFolderID}" height="100"/>
+					</div>
+	
 					<div class="checkbox">
 						<label for="divappex${appexNumber}NB">
 							<input name="divappex${appexNumber}NB" id="divappex${appexNumber}NB" type="checkbox" value="true"/>
Index: lams_central/web/authoring/template/tbl/appexDoku.jsp
===================================================================
diff -u -r766973f2a21ca668667914744418c4c25dc031e3 -r5e1779fdea3b14515d2eeb9079168e81b6defa81
--- lams_central/web/authoring/template/tbl/appexDoku.jsp	(.../appexDoku.jsp)	(revision 766973f2a21ca668667914744418c4c25dc031e3)
+++ lams_central/web/authoring/template/tbl/appexDoku.jsp	(.../appexDoku.jsp)	(revision 5e1779fdea3b14515d2eeb9079168e81b6defa81)
@@ -30,16 +30,19 @@
 		<span>&nbsp;</span>
 		<i class='fa fa-sm fa-pencil'></i>
 		<input type="hidden" name="${appexTitleField}" id="${appexTitleField}" value="${appexTitle}"/>
+		
+		<input type="hidden" name="divappex${param.appexNumber}IsDoku" value="true"/>
      </div>
     
     <div id="collapseAppex${param.appexNumber}" class="panel-body panel-collapse collapse in" 
     	 role="tabpanel" aria-labelledby="headingAppex${param.appexNumber}">	
 		<div class="form-group">
-		    <label for="divappex${param.appexNumber}dokuDescription">
+		    <label for="divappex${param.appexNumber}Description">
 				<fmt:message key="authoring.label.application.exercise.doku.description" />&nbsp;
-				<i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right" title="" data-original-title="<fmt:message key="authoring.label.application.exercise.doku.description.tooltip"/>"></i>
+				<i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right" title=""
+				   data-original-title="<fmt:message key="authoring.label.application.exercise.doku.description.tooltip"/>"></i>
 			</label>
-		    <lams:CKEditor id="divappex${param.appexNumber}dokuDescription" value="" contentFolderID="${param.contentFolderID}" height="100"/>
+		    <lams:CKEditor id="divappex${param.appexNumber}Description" value="" contentFolderID="${param.contentFolderID}" height="100"/>
 		</div>
 		
 		<div class="form-group">