Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml
===================================================================
diff -u -r3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision 3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc)
@@ -183,7 +183,15 @@
         insert="true"
         column="enable_confidence_levels"
     />
-    
+   
+      <property
+        name="displayFeedbackOnly"
+        type="boolean"
+        update="true"
+        insert="true"
+        column="display_feedback_only"
+    />
+ 
    	 <set
             name="mcQueContents"
             order-by="display_order"
Index: lams_tool_lamc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r4c51f9c8b6fab7efa4d5296f1ee60c1c3bd207e5 -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc
--- lams_tool_lamc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4c51f9c8b6fab7efa4d5296f1ee60c1c3bd207e5)
+++ lams_tool_lamc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc)
@@ -141,11 +141,17 @@
 label.final.attempt  =Final attempt:
 output.desc.learner.mark  =Learner's total mark
 output.desc.learner.all.correct  =Are learner's answers all correct?
-label.displayAnswers  =Display correct answers and score after last question
-label.monitoring.yesDisplayAnswers  =Learners are able to see the answers for all questions.
-label.monitoring.noDisplayAnswers1  =Learners are not able to see the answers for the questions
+label.displayAnswers  =Display correct answers, score and feedback after last question
+label.displayFeedbackOnly  =Display only the feedback and not the answers or score
+label.displayNoAnswersOrFeedback  =Do not display answers, score or feedback
+label.monitoring.yesDisplayAnswers  =Learners are able to see the answers for the questions.
+label.monitoring.noDisplayAnswers1  =Learners are not able to see answers, scores or feedback for the questions
 label.monitoring.noDisplayAnswers2  =Do you want to allow learners to see the answers now?
-button.monitoring.noDisplayAnswers  =Yes
+button.monitoring.yes  =Yes
+label.monitoring.yesDisplayFeedbackOnly  =Learners are able to see the feedback but no answers or scores for the questions.
+label.monitoring.noDisplayFeedbackOnly1  =Learners are not able to see the feedback for the questions
+label.monitoring.noDisplayFeedbackOnly2  =Do you want to allow learners to see the feedback now?
+
 output.desc.learner.all.correct.true  =All correct
 output.desc.learner.all.correct.false  =Not all correct
 label.monitoring.downloadMarks.button  =Export marks
Index: lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r4c51f9c8b6fab7efa4d5296f1ee60c1c3bd207e5 -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc
--- lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 4c51f9c8b6fab7efa4d5296f1ee60c1c3bd207e5)
+++ lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc)
@@ -141,11 +141,11 @@
 label.final.attempt  =Final attempt:
 output.desc.learner.mark  =Learner's total mark
 output.desc.learner.all.correct  =Are learner's answers all correct?
-label.displayAnswers  =Display correct answers and score after last question
-label.monitoring.yesDisplayAnswers  =Learners are able to see the answers for all questions.
-label.monitoring.noDisplayAnswers1  =Learners are not able to see the answers for the questions
+label.displayAnswers  =Display correct answers, score and feedback after last question
+label.monitoring.yesDisplayAnswers  =Learners are able to see the answers for the questions.
+label.monitoring.noDisplayAnswers1  =Learners are not able to see answers, scores or feedback for the questions
 label.monitoring.noDisplayAnswers2  =Do you want to allow learners to see the answers now?
-button.monitoring.noDisplayAnswers  =Yes
+button.monitoring.yes  =Yes
 output.desc.learner.all.correct.true  =All correct
 output.desc.learner.all.correct.false  =Not all correct
 label.monitoring.downloadMarks.button  =Export marks
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20180511.sql
===================================================================
diff -u
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20180511.sql	(revision 0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20180511.sql	(revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc)
@@ -0,0 +1,14 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-4577 Split feedback and marks in MCQ
+ALTER TABLE tl_lamc11_content ADD COLUMN display_feedback_only TINYINT(1) NOT NULL DEFAULT 0;
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McGeneralLearnerFlowDTO.java
===================================================================
diff -u -r289926a27bdbc9bd2519e3064a85f489fc1845ec -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McGeneralLearnerFlowDTO.java	(.../McGeneralLearnerFlowDTO.java)	(revision 289926a27bdbc9bd2519e3064a85f489fc1845ec)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McGeneralLearnerFlowDTO.java	(.../McGeneralLearnerFlowDTO.java)	(revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc)
@@ -78,6 +78,7 @@
     protected String showMarks;
 
     protected String displayAnswers;
+    protected String displayFeedbackOnly;
 
     protected Map mapGeneralOptionsContent;
 
@@ -354,9 +355,10 @@
 		.append("passMarkApplicable: ", passMarkApplicable).append("userPassed: ", userPassed)
 		.append("userOverPassMark: ", userOverPassMark).append("reportTitleLearner: ", reportTitleLearner)
 		.append("activityInstructions: ", activityInstructions).append("activityTitle: ", activityTitle)
-		.append("displayAnswers: ", displayAnswers).append("reflection: ", reflection)
-		.append("reflectionSubject: ", reflectionSubject).append("notebookEntry: ", notebookEntry)
-		.append("notebookEntriesVisible: ", notebookEntriesVisible).toString();
+		.append("displayAnswers: ", displayAnswers).append("displayFeedbackOnly: ", displayFeedbackOnly)
+		.append("reflection: ", reflection).append("reflectionSubject: ", reflectionSubject)
+		.append("notebookEntry: ", notebookEntry).append("notebookEntriesVisible: ", notebookEntriesVisible)
+		.toString();
     }
 
     /**
@@ -564,6 +566,14 @@
 	this.displayAnswers = displayAnswers;
     }
 
+    public String getDisplayFeedbackOnly() {
+	return displayFeedbackOnly;
+    }
+
+    public void setDisplayFeedbackOnly(String displayFeedbackOnly) {
+	this.displayFeedbackOnly = displayFeedbackOnly;
+    }
+
     /**
      * @return Returns the attemptMap.
      */
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McGeneralMonitoringDTO.java
===================================================================
diff -u -r289926a27bdbc9bd2519e3064a85f489fc1845ec -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McGeneralMonitoringDTO.java	(.../McGeneralMonitoringDTO.java)	(revision 289926a27bdbc9bd2519e3064a85f489fc1845ec)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McGeneralMonitoringDTO.java	(.../McGeneralMonitoringDTO.java)	(revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc)
@@ -36,6 +36,7 @@
     protected Integer countAllUsers;
     protected Integer countSessionComplete;
     protected String displayAnswers;
+    private String displayFeedbackOnly;
     protected String toolContentID;
 
     protected String contentFolderID;
@@ -115,6 +116,14 @@
 	this.displayAnswers = displayAnswers;
     }
 
+    public String getDisplayFeedbackOnly() {
+	return displayFeedbackOnly;
+    }
+
+    public void setDisplayFeedbackOnly(String displayFeedbackOnly) {
+	this.displayFeedbackOnly = displayFeedbackOnly;
+    }
+
     /**
      * @return Returns the toolContentID.
      */
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java
===================================================================
diff -u -r3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java	(.../McContent.java)	(revision 3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java	(.../McContent.java)	(revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc)
@@ -78,6 +78,7 @@
     private boolean randomize;
 
     private boolean displayAnswers;
+    private boolean displayFeedbackOnly;
 
     private boolean showMarks;
 
@@ -105,8 +106,9 @@
     public McContent(Long mcContentId, String title, String instructions, boolean defineLater, Date creationDate,
 	    Date updateDate, boolean questionsSequenced, long createdBy, Integer passMark,
 	    boolean enableConfidenceLevels, boolean showReport, boolean randomize, boolean displayAnswers,
-	    boolean showMarks, boolean useSelectLeaderToolOuput, boolean prefixAnswersWithLetters, boolean retries,
-	    boolean reflect, String reflectionSubject, Set mcQueContents, Set mcSessions) {
+	    boolean displayFeedbackOnly, boolean showMarks, boolean useSelectLeaderToolOuput, 
+	    boolean prefixAnswersWithLetters, boolean retries, boolean reflect, String reflectionSubject, 
+	    Set mcQueContents, Set mcSessions) {
 
 	this.mcContentId = mcContentId;
 	this.title = title;
@@ -124,6 +126,7 @@
 	this.showReport = showReport;
 	this.randomize = randomize;
 	this.displayAnswers = displayAnswers;
+	this.displayFeedbackOnly = displayFeedbackOnly;
 	this.showMarks = showMarks;
 	this.useSelectLeaderToolOuput = useSelectLeaderToolOuput;
 	this.prefixAnswersWithLetters = prefixAnswersWithLetters;
@@ -158,7 +161,7 @@
 	McContent newContent = new McContent(newContentId, mc.getTitle(), mc.getInstructions(), mc.isDefineLater(),
 		mc.getCreationDate(), mc.getUpdateDate(), mc.isQuestionsSequenced(), mc.getCreatedBy(),
 		mc.getPassMark(), mc.isEnableConfidenceLevels(), mc.isShowReport(), mc.isRandomize(),
-		mc.isDisplayAnswers(), mc.isShowMarks(), mc.isUseSelectLeaderToolOuput(),
+		mc.isDisplayAnswers(), mc.displayFeedbackOnly, mc.isShowMarks(), mc.isUseSelectLeaderToolOuput(),
 		mc.isPrefixAnswersWithLetters(), mc.isRetries(), mc.isReflect(), mc.getReflectionSubject(),
 		new TreeSet(), new TreeSet());
 	newContent.setMcQueContents(mc.deepCopyMcQueContent(newContent));
@@ -441,6 +444,14 @@
 	this.displayAnswers = displayAnswers;
     }
 
+    public boolean isDisplayFeedbackOnly() {
+	return displayFeedbackOnly;
+    }
+
+    public void setDisplayFeedbackOnly(boolean displayFeedbackOnly) {
+	this.displayFeedbackOnly = displayFeedbackOnly;
+    }
+
     /**
      * @return date submissionDeadline
      */
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
===================================================================
diff -u -rd39b9df30d44b56c287b8a1d4409407e60692dc4 -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision d39b9df30d44b56c287b8a1d4409407e60692dc4)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc)
@@ -1947,6 +1947,7 @@
 	mcq.setRandomize(JsonUtil.opt(toolContentJSON, "randomize", Boolean.FALSE));
 	mcq.setShowReport(JsonUtil.opt(toolContentJSON, "showReport", Boolean.FALSE));
 	mcq.setDisplayAnswers(JsonUtil.opt(toolContentJSON, "displayAnswers", Boolean.FALSE));
+	mcq.setDisplayFeedbackOnly(JsonUtil.opt(toolContentJSON, "displayFeedbackOnly", Boolean.FALSE));
 	mcq.setShowMarks(JsonUtil.opt(toolContentJSON, "showMarks", Boolean.FALSE));
 	mcq.setPrefixAnswersWithLetters(JsonUtil.opt(toolContentJSON, "prefixAnswersWithLetters", Boolean.TRUE));
 	mcq.setPassMark(JsonUtil.opt(toolContentJSON, "passMark", 0));
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
===================================================================
diff -u -r3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc)
@@ -26,10 +26,7 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
-import java.util.TreeMap;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -74,7 +71,7 @@
     }
 
     /**
-     * persisting content
+     * persisting content. 
      */
     public static McContent saveOrUpdateMcContent(IMcService mcService, HttpServletRequest request, McContent mcContent,
 	    String strToolContentID, List<McQuestionDTO> questionDTOs) {
@@ -87,7 +84,7 @@
 	String prefixAnswersWithLetters = request.getParameter("prefixAnswersWithLetters");
 	String questionsSequenced = request.getParameter("questionsSequenced");
 	String randomize = request.getParameter("randomize");
-	String displayAnswers = request.getParameter("displayAnswers");
+	String displayAnswersFeedback = request.getParameter("displayAnswersFeedback");
 	String showMarks = request.getParameter("showMarks");
 	String retries = request.getParameter("retries");
 	String reflect = request.getParameter(McAppConstants.REFLECT);
@@ -96,6 +93,7 @@
 	boolean questionsSequencedBoolean = false;
 	boolean randomizeBoolean = false;
 	boolean displayAnswersBoolean = false;
+	boolean displayFeedbackOnlyBoolean = false;
 	boolean showMarksBoolean = false;
 	boolean slnBoolean = false;
 	boolean useSelectLeaderToolOuputBoolean = false;
@@ -112,8 +110,14 @@
 	    randomizeBoolean = true;
 	}
 
-	if ((displayAnswers != null) && (displayAnswers.equalsIgnoreCase("1"))) {
-	    displayAnswersBoolean = true;
+	if ( displayAnswersFeedback != null) {
+	    if ( displayAnswersFeedback.equalsIgnoreCase("answers")) {
+		displayAnswersBoolean = true;
+		displayFeedbackOnlyBoolean = false;
+	    } else if ( displayAnswersFeedback.equalsIgnoreCase("feedback")) {
+		displayAnswersBoolean = false;
+		displayFeedbackOnlyBoolean = true;
+	    }
 	}
 
 	if ((showMarks != null) && (showMarks.equalsIgnoreCase("1"))) {
@@ -171,6 +175,7 @@
 	mcContent.setQuestionsSequenced(questionsSequencedBoolean);
 	mcContent.setRandomize(randomizeBoolean);
 	mcContent.setDisplayAnswers(displayAnswersBoolean);
+	mcContent.setDisplayFeedbackOnly(displayFeedbackOnlyBoolean);
 	mcContent.setShowMarks(showMarksBoolean);
 	mcContent.setRetries(retriesBoolean);
 	mcContent.setShowReport(slnBoolean);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
===================================================================
diff -u -rb59caadeddd933fa728db459c8ff96f04f398a58 -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java	(.../McLearningAction.java)	(revision b59caadeddd933fa728db459c8ff96f04f398a58)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java	(.../McLearningAction.java)	(revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc)
@@ -491,6 +491,7 @@
 	mcGeneralLearnerFlowDTO.setTotalMarksPossible(mcContent.getTotalMarksPossible());
 	mcGeneralLearnerFlowDTO.setShowMarks(new Boolean(mcContent.isShowMarks()).toString());
 	mcGeneralLearnerFlowDTO.setDisplayAnswers(new Boolean(mcContent.isDisplayAnswers()).toString());
+	mcGeneralLearnerFlowDTO.setDisplayFeedbackOnly(((Boolean)mcContent.isDisplayFeedbackOnly()).toString());	
 	mcGeneralLearnerFlowDTO.setLearnerMark(user.getLastAttemptTotalMark());
 	
 	Object[] markStatistics = null;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningStarterAction.java
===================================================================
diff -u -r4170df8bc66e658ef4dcd47e99eceddec3c2673a -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision 4170df8bc66e658ef4dcd47e99eceddec3c2673a)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc)
@@ -158,6 +158,7 @@
 
 	Boolean displayAnswers = mcContent.isDisplayAnswers();
 	mcGeneralLearnerFlowDTO.setDisplayAnswers(displayAnswers.toString());
+	mcGeneralLearnerFlowDTO.setDisplayFeedbackOnly(((Boolean)mcContent.isDisplayFeedbackOnly()).toString());	
 	mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString());
 	// String reflectionSubject = McUtils.replaceNewLines(mcContent.getReflectionSubject());
 	mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject());
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
===================================================================
diff -u -reeb8faaea5372ccf5445d7172f726931e9f26098 -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java	(.../McMonitoringAction.java)	(revision eeb8faaea5372ccf5445d7172f726931e9f26098)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java	(.../McMonitoringAction.java)	(revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc)
@@ -76,7 +76,7 @@
     private static Logger logger = Logger.getLogger(McMonitoringAction.class.getName());
 
     /**
-     * displayAnswers
+     * Turn on displayAnswers
      */
     public ActionForward displayAnswers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException {
@@ -86,6 +86,7 @@
 	
 	McContent mcContent = mcService.getMcContent(new Long(strToolContentID));
 	mcContent.setDisplayAnswers(new Boolean(true));
+	mcContent.setDisplayFeedbackOnly(new Boolean(false));
 	mcService.updateMc(mcContent);
 	
 	// use redirect to prevent resubmition of the same request
@@ -96,6 +97,26 @@
     }
 
     /**
+     * Turn on displayFeedbackOnly
+     */
+    public ActionForward displayFeedbackOnly(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	
+	McContent mcContent = mcService.getMcContent(new Long(strToolContentID));
+	mcContent.setDisplayFeedbackOnly(new Boolean(true));
+	mcService.updateMc(mcContent);
+	
+	// use redirect to prevent resubmition of the same request
+	ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("monitoringStarterRedirect"));
+	redirect.addParameter(McAppConstants.TOOL_CONTENT_ID, strToolContentID);
+	redirect.addParameter(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
+	return redirect;
+    }
+
+    /**
      * allows viewing users reflection data
      */
     public ActionForward openNotebook(ActionMapping mapping, ActionForm form, HttpServletRequest request,
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringStarterAction.java
===================================================================
diff -u -r3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringStarterAction.java	(.../McMonitoringStarterAction.java)	(revision 3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringStarterAction.java	(.../McMonitoringStarterAction.java)	(revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc)
@@ -23,7 +23,6 @@
 package org.lamsfoundation.lams.tool.mc.web.action;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -112,6 +111,7 @@
 	request.setAttribute("prefixAnswersWithLetters", mcContent.isPrefixAnswersWithLetters());
 	request.setAttribute("randomize", mcContent.isRandomize());
 	request.setAttribute("displayAnswers", mcContent.isDisplayAnswers());
+	request.setAttribute("displayFeedbackOnly", mcContent.isDisplayFeedbackOnly());
 	request.setAttribute("retries", mcContent.isRetries());
 	request.setAttribute("reflect", mcContent.isReflect());
 	request.setAttribute("reflectionSubject", mcContent.getReflectionSubject());
@@ -139,6 +139,7 @@
 	/* this section is needed for Edit Activity screen, from here... */
 
 	mcGeneralMonitoringDTO.setDisplayAnswers(new Boolean(mcContent.isDisplayAnswers()).toString());
+	mcGeneralMonitoringDTO.setDisplayFeedbackOnly(new Boolean(mcContent.isDisplayFeedbackOnly()).toString());
 
 	List<ReflectionDTO> reflectionsContainerDTO = service.getReflectionList(mcContent, null);
 	request.setAttribute(McAppConstants.REFLECTIONS_CONTAINER_DTO, reflectionsContainerDTO);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McStarterAction.java
===================================================================
diff -u -r3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McStarterAction.java	(.../McStarterAction.java)	(revision 3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McStarterAction.java	(.../McStarterAction.java)	(revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc)
@@ -100,7 +100,7 @@
 	mcAuthoringForm.setSln(mcContent.isShowReport() ? "1" : "0");
 	mcAuthoringForm.setQuestionsSequenced(mcContent.isQuestionsSequenced() ? "1" : "0");
 	mcAuthoringForm.setRandomize(mcContent.isRandomize() ? "1" : "0");
-	mcAuthoringForm.setDisplayAnswers(mcContent.isDisplayAnswers() ? "1" : "0");
+	mcAuthoringForm.setDisplayAnswersFeedback(mcContent.isDisplayAnswers() ? "answers" : mcContent.isDisplayFeedbackOnly() ? "feedback" : "none");
 	mcAuthoringForm.setShowMarks(mcContent.isShowMarks() ? "1" : "0");
 	mcAuthoringForm.setUseSelectLeaderToolOuput(mcContent.isUseSelectLeaderToolOuput() ? "1" : "0");
 	mcAuthoringForm.setPrefixAnswersWithLetters(mcContent.isPrefixAnswersWithLetters() ? "1" : "0");
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McAuthoringForm.java
===================================================================
diff -u -r3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McAuthoringForm.java	(.../McAuthoringForm.java)	(revision 3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McAuthoringForm.java	(.../McAuthoringForm.java)	(revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc)
@@ -36,7 +36,7 @@
     protected String useSelectLeaderToolOuput;
     protected String prefixAnswersWithLetters;
     protected String randomize;
-    protected String displayAnswers;
+    protected String displayAnswersFeedback;
 
     protected String submitAllContent;
 
@@ -371,16 +371,16 @@
     /**
      * @return Returns the displayAnswers.
      */
-    public String getDisplayAnswers() {
-	return displayAnswers;
+    public String getDisplayAnswersFeedback() {
+	return displayAnswersFeedback;
     }
 
     /**
      * @param displayAnswers
      *            The displayAnswers to set.
      */
-    public void setDisplayAnswers(String displayAnswers) {
-	this.displayAnswers = displayAnswers;
+    public void setDisplayAnswersFeedback(String displayAnswersFeedback) {
+	this.displayAnswersFeedback = displayAnswersFeedback;
     }
 
 }
Index: lams_tool_lamc/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc
--- lams_tool_lamc/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa)
+++ lams_tool_lamc/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc)
@@ -40,13 +40,6 @@
 	</div>
 	
 	<div class="checkbox">
-		<label for="displayAnswers">
-			<html:checkbox property="displayAnswers" value="1" styleId="displayAnswers"/>
-			<fmt:message key="label.displayAnswers" />
-		</label>
-	</div>
-	
-	<div class="checkbox">
 		<label for="retries">
 			<html:checkbox property="retries" value="1" styleId="retries"/>
 			<fmt:message key="radiobox.retries" />
@@ -73,6 +66,30 @@
 			<fmt:message key="label.enable.confidence.levels" />
 		</label>
 	</div>
+
+	<lams:SimplePanel panelBodyClass="panel-body-sm">
+	<div class="radio">
+		<label for="displayAnswers">
+			<html:radio property="displayAnswersFeedback" value="answers" styleId="displayAnswers"/>
+			<fmt:message key="label.displayAnswers" />		
+		</label>
+	</div>
+
+	<div class="radio form-inline">
+		<label for="displayFeedback">
+			<html:radio property="displayAnswersFeedback" value="feedback" styleId="displayFeedback"/>
+			<fmt:message key="label.displayFeedbackOnly" />
+		</label>
+	</div>
+
+	<div class="radio form-inline">
+		<label for="displayNoAnswersOrFeedback">
+			<html:radio property="displayAnswersFeedback" value="none" styleId="displayNoAnswersOrFeedback"/>
+			<fmt:message key="label.displayNoAnswersOrFeedback" />
+		</label>
+	</div>
+	</lams:SimplePanel>
+	
 </lams:SimplePanel>
 
 <lams:SimplePanel titleKey="label.activity.completion">
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
diff -u -r78b448706a4b92d425c6d68add1c40d82759a6c7 -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc)
@@ -189,7 +189,7 @@
 							</c:forEach>
 
 							<!-- answer feedback -->
-							<c:if test="${mcGeneralLearnerFlowDTO.displayAnswers == 'true'}">
+							<c:if test="${mcGeneralLearnerFlowDTO.displayAnswers == 'true' || mcGeneralLearnerFlowDTO.displayFeedbackOnly == 'true'}">
 								<c:forEach var="feedbackEntry" items="${mcGeneralLearnerFlowDTO.mapFeedbackContent}">
 									<c:if test="${(requestScope.mainQueIndex == feedbackEntry.key)
                                           && (feedbackEntry.value != null) && (feedbackEntry.value != '')}">
Index: lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc
--- lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa)
+++ lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc)
@@ -48,7 +48,11 @@
 		function turnOnDisplayAnswers() {
 			window.open("<c:url value='/monitoring.do'/>?dispatch=displayAnswers&toolContentID=${mcGeneralMonitoringDTO.toolContentID}&contentFolderID=${contentFolderID}","_self")
 		}
-	
+
+		function turnOnDisplayFeedbackOnly() {
+			window.open("<c:url value='/monitoring.do'/>?dispatch=displayFeedbackOnly&toolContentID=${mcGeneralMonitoringDTO.toolContentID}&contentFolderID=${contentFolderID}","_self")
+		}
+
 	</script>
 	
 </lams:head>
Index: lams_tool_lamc/web/monitoring/parts/advanceOptions.jsp
===================================================================
diff -u -r463f7b3dbb88ee41210f7170dc19dc25360cd26f -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc
--- lams_tool_lamc/web/monitoring/parts/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision 463f7b3dbb88ee41210f7170dc19dc25360cd26f)
+++ lams_tool_lamc/web/monitoring/parts/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc)
@@ -100,6 +100,22 @@
 			</c:choose>
 		</td>
 	</tr>
+
+	<tr>
+		<td>
+			<fmt:message key="label.displayFeedbackOnly" />
+		</td>	
+		<td>
+			<c:choose>
+				<c:when test="${displayFeedbackOnly}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>
+		</td>
+	</tr>
 	 		
 	<tr>
 	 	<td>
@@ -159,17 +175,31 @@
 			<c:when test="${mcGeneralMonitoringDTO.displayAnswers == 'true'}">
 				<fmt:message key="label.monitoring.yesDisplayAnswers"/>
 			</c:when>
-			<c:when test="${mcGeneralMonitoringDTO.displayAnswers == 'false'}">
+			<c:when test="${mcGeneralMonitoringDTO.displayAnswers == 'false' && mcGeneralMonitoringDTO.displayFeedbackOnly == 'true'}">
+				<fmt:message key="label.monitoring.yesDisplayFeedbackOnly"/><br/>
+				<quote>
+					<fmt:message key="label.monitoring.noDisplayAnswers2"/>&nbsp;
+					<input onclick="javascript:turnOnDisplayAnswers();" name="displayAnswers" 
+							class="btn btn-default btn-xs" value="<fmt:message key='button.monitoring.yes'/>" type="button">	
+				</quote>
+			</c:when>
+			<c:when test="${mcGeneralMonitoringDTO.displayAnswers == 'false' && mcGeneralMonitoringDTO.displayFeedbackOnly == 'false'}">
 				<fmt:message key="label.monitoring.noDisplayAnswers1"/><br/>
 				<quote>
 					<fmt:message key="label.monitoring.noDisplayAnswers2"/>&nbsp;
 					<input onclick="javascript:turnOnDisplayAnswers();" name="displayAnswers" 
-							class="btn btn-default btn-xs" value="<fmt:message key='button.monitoring.noDisplayAnswers'/>" type="button">	
+							class="btn btn-default btn-xs" value="<fmt:message key='button.monitoring.yes'/>" type="button">	
+				</quote><br/>
+				<quote>
+					<fmt:message key="label.monitoring.noDisplayFeedbackOnly2"/>&nbsp;
+					<input onclick="javascript:turnOnDisplayFeedbackOnly();" name="displayFeedbackOnly" 
+							class="btn btn-default btn-xs" value="<fmt:message key='button.monitoring.yes'/>" type="button">	
 				</quote>
 			</c:when>
 		</c:choose>
 		</td>
 	</tr>
+
 </table>
 
 </lams:AdvancedAccordian>
\ No newline at end of file