Index: lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml
===================================================================
diff -u -rbbe9589ceab063d62380b9fe3f02648a4581e109 -r3a8732a27caaa2eda8712c7a2f24f5788c7d110a
--- lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml	(.../Scratchie.hbm.xml)	(revision bbe9589ceab063d62380b9fe3f02648a4581e109)
+++ lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml	(.../Scratchie.hbm.xml)	(revision 3a8732a27caaa2eda8712c7a2f24f5788c7d110a)
@@ -159,6 +159,14 @@
             column="confidence_levels_activity_uiid"
             unique="true"
         />
+        
+        <property
+            name="presetMarks"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="preset_marks"
+        />
 
         <!--
             To add non XDoclet property mappings, create a file named
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r868cbadb5ccd51c7172a97cfd02b31edbaa9d97a -r3a8732a27caaa2eda8712c7a2f24f5788c7d110a
--- lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 868cbadb5ccd51c7172a97cfd02b31edbaa9d97a)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 3a8732a27caaa2eda8712c7a2f24f5788c7d110a)
@@ -213,6 +213,10 @@
 label.save.learning.design  =In order to select activity with  confidence levels please save your sequence first.
 
 label.burning.questions.autosaved  =Burning questions autosaved
+label.change.marking.allocation  =Change marking allocation
+label.change.marking.allocation.warning  =Attention: changing marking allocation will affect the way marks get calculated.
+label.modify.default.marking  =Modify default marking
 
 
+
 #======= End labels: Exported 203 labels for en AU =====
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
===================================================================
diff -u -rbbe9589ceab063d62380b9fe3f02648a4581e109 -r3a8732a27caaa2eda8712c7a2f24f5788c7d110a
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	(.../ScratchieConstants.java)	(revision bbe9589ceab063d62380b9fe3f02648a4581e109)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	(.../ScratchieConstants.java)	(revision 3a8732a27caaa2eda8712c7a2f24f5788c7d110a)
@@ -148,6 +148,10 @@
     public static final String ATTR_REFLECTION_ON = "reflectOn";
 
     public static final String ATTR_IS_BURNING_QUESTIONS_ENABLED = "isBurningQuestionsEnabled";
+    
+    public static final String ATTR_IS_PRESET_MARKS_OVERWRITTEN = "isPresetMarksOverwritten";
+    
+    public static final String ATTR_DEFAULT_PRESET_MARKS = "defaultPresetMarks";
 
     public static final String ATTR_REFLECTION_INSTRUCTION = "reflectInstructions";
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20171106.sql
===================================================================
diff -u
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20171106.sql	(revision 0)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20171106.sql	(revision 3a8732a27caaa2eda8712c7a2f24f5788c7d110a)
@@ -0,0 +1,15 @@
+-- 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-4458 Add option to overwrite default scoring system
+ALTER TABLE tl_lascrt11_scratchie ADD COLUMN preset_marks varchar(255);
+
+----------------------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;
+
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
===================================================================
diff -u -rbbe9589ceab063d62380b9fe3f02648a4581e109 -r3a8732a27caaa2eda8712c7a2f24f5788c7d110a
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	(.../Scratchie.java)	(revision bbe9589ceab063d62380b9fe3f02648a4581e109)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	(.../Scratchie.java)	(revision 3a8732a27caaa2eda8712c7a2f24f5788c7d110a)
@@ -74,6 +74,9 @@
     private int timeLimit;
     
     private Integer confidenceLevelsActivityUiid;
+    
+    //overwrites default preset marks stored as admin config setting
+    private String presetMarks;
 
     private boolean reflectOnActivity;
 
@@ -396,4 +399,18 @@
     public void setConfidenceLevelsActivityUiid(Integer confidenceLevelsActivityUiid) {
 	this.confidenceLevelsActivityUiid = confidenceLevelsActivityUiid;
     }
+    
+    /**
+     * This property holds value that can overwrite default preset marks stored in admin config setting. It can be null
+     * and therefore ScratchieService.getPresetMarks() method should be used instead when calculating actual marks.
+     *
+     * @return
+     */
+   public String getPresetMarks() {
+	return presetMarks;
+   }
+
+   public void setPresetMarks(String presetMarks) {
+	this.presetMarks = presetMarks;
+   }
 }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
===================================================================
diff -u -r868cbadb5ccd51c7172a97cfd02b31edbaa9d97a -r3a8732a27caaa2eda8712c7a2f24f5788c7d110a
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	(.../IScratchieService.java)	(revision 868cbadb5ccd51c7172a97cfd02b31edbaa9d97a)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	(.../IScratchieService.java)	(revision 3a8732a27caaa2eda8712c7a2f24f5788c7d110a)
@@ -391,6 +391,15 @@
 
     void saveOrUpdateScratchieConfigItem(ScratchieConfigItem item);
     
+    /**
+     * Return preset marks that is going to be used for calculating learners' marks. Return scratchie.presetMarks if
+     * it's not null, otherwise returns default setting stored as admin config setting.
+     * 
+     * @param scratchie
+     * @return
+     */
+    String[] getPresetMarks(Scratchie scratchie);
+    
     /** Get the raw marks for display in a graph in monitoring */
     List<Number> getMarksArray(Long contentId);
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r3a8732a27caaa2eda8712c7a2f24f5788c7d110a
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java	(.../ScratchieOutputFactory.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java	(.../ScratchieOutputFactory.java)	(revision 3a8732a27caaa2eda8712c7a2f24f5788c7d110a)
@@ -67,10 +67,8 @@
 	    int itemsNumber = scratchie.getScratchieItems().size();
 
 	    // calculate totalMarksPossible
-	    String presetMarks = scratchieService.getConfigItem(ScratchieConfigItem.KEY_PRESET_MARKS).getConfigValue();
-	    String[] presetMarksArray = presetMarks.split(",");
-	    long totalMarksPossible = (presetMarksArray.length > 0)
-		    ? itemsNumber * Integer.parseInt(presetMarksArray[0]) : 0;
+	    String[] presetMarks = scratchieService.getPresetMarks(scratchie);
+	    long totalMarksPossible = (presetMarks.length > 0) ? itemsNumber * Integer.parseInt(presetMarks[0]) : 0;
 
 	    // count in extra point if this option is ON
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -r868cbadb5ccd51c7172a97cfd02b31edbaa9d97a -r3a8732a27caaa2eda8712c7a2f24f5788c7d110a
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 868cbadb5ccd51c7172a97cfd02b31edbaa9d97a)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 3a8732a27caaa2eda8712c7a2f24f5788c7d110a)
@@ -227,6 +227,22 @@
     public void saveOrUpdateScratchieConfigItem(ScratchieConfigItem item) {
 	scratchieConfigItemDao.saveOrUpdate(item);
     }
+    
+    @Override
+    public String[] getPresetMarks(Scratchie scratchie) {
+	String presetMarks = "";
+	if (StringUtils.isNotEmpty(scratchie.getPresetMarks())) {
+	    presetMarks = scratchie.getPresetMarks();
+	} else {
+	    ScratchieConfigItem defaultPresetMarks = getConfigItem(ScratchieConfigItem.KEY_PRESET_MARKS);
+	    if (defaultPresetMarks != null) {
+		presetMarks = defaultPresetMarks.getConfigValue();
+	    }
+	}
+	
+	return presetMarks.split(",");
+    }
+    
 
     @Override
     public void deleteScratchieItem(Long uid) {
@@ -411,7 +427,7 @@
 	ScratchieSession session = this.getScratchieSessionBySessionId(sessionId);
 	Scratchie scratchie = session.getScratchie();
 	Set<ScratchieItem> items = scratchie.getScratchieItems();
-	String presetMarks = getConfigItem(ScratchieConfigItem.KEY_PRESET_MARKS).getConfigValue();
+	String[] presetMarks = getPresetMarks(scratchie);
 
 	// calculate mark
 	int mark = 0;
@@ -746,17 +762,15 @@
      * @return
      */
     private int getUserMarkPerItem(Scratchie scratchie, ScratchieItem item, List<ScratchieAnswerVisitLog> userLogs,
-	    String presetMarks) {
+	    String[] presetMarks) {
 
-	String[] marksArray = presetMarks.split(",");
-
 	int mark = 0;
 	// add mark only if an item was unraveled
 	if (isItemUnraveled(item, userLogs)) {
 
 	    int itemAttempts = calculateItemAttempts(userLogs, item);
-	    String markStr = (itemAttempts <= marksArray.length) ? marksArray[itemAttempts - 1]
-		    : marksArray[marksArray.length - 1];
+	    String markStr = (itemAttempts <= presetMarks.length) ? presetMarks[itemAttempts - 1]
+		    : presetMarks[presetMarks.length - 1];
 	    mark = Integer.parseInt(markStr);
 
 	    // add extra point if needed
@@ -1643,7 +1657,7 @@
     private List<GroupSummary> getSummaryByTeam(Scratchie scratchie, Collection<ScratchieItem> sortedItems) {
 	List<GroupSummary> groupSummaries = new ArrayList<>();
 
-	String presetMarks = getConfigItem(ScratchieConfigItem.KEY_PRESET_MARKS).getConfigValue();
+	String[] presetMarks = getPresetMarks(scratchie);
 
 	List<ScratchieSession> sessionList = scratchieSessionDao.getByContentId(scratchie.getContentId());
 	for (ScratchieSession session : sessionList) {
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
===================================================================
diff -u -rbbe9589ceab063d62380b9fe3f02648a4581e109 -r3a8732a27caaa2eda8712c7a2f24f5788c7d110a
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision bbe9589ceab063d62380b9fe3f02648a4581e109)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 3a8732a27caaa2eda8712c7a2f24f5788c7d110a)
@@ -193,10 +193,6 @@
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	scratchieForm.setSessionMapID(sessionMap.getSessionID());
 
-	ScratchieConfigItem isEnabledExtraPointOption = service
-		.getConfigItem(ScratchieConfigItem.KEY_IS_ENABLED_EXTRA_POINT_OPTION);
-	sessionMap.put(ScratchieConfigItem.KEY_IS_ENABLED_EXTRA_POINT_OPTION,
-		new Boolean(isEnabledExtraPointOption.getConfigValue()));
 
 	// Get contentFolderID and save to form.
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
@@ -223,6 +219,18 @@
 	    throw new ServletException(e);
 	}
 
+	ScratchieConfigItem isEnabledExtraPointOption = service
+		.getConfigItem(ScratchieConfigItem.KEY_IS_ENABLED_EXTRA_POINT_OPTION);
+	sessionMap.put(ScratchieConfigItem.KEY_IS_ENABLED_EXTRA_POINT_OPTION,
+		new Boolean(isEnabledExtraPointOption.getConfigValue()));
+	
+	//prepare advanced option allowing to overwrite default preset marks
+	ScratchieConfigItem defaultPresetMarksConfigItem = service.getConfigItem(ScratchieConfigItem.KEY_PRESET_MARKS);
+	String defaultPresetMarks = defaultPresetMarksConfigItem == null ? "" : defaultPresetMarksConfigItem.getConfigValue();
+	boolean presetMarksOverwritten = scratchie.getPresetMarks() != null && !scratchie.getPresetMarks().equals(defaultPresetMarks);
+	sessionMap.put(ScratchieConstants.ATTR_IS_PRESET_MARKS_OVERWRITTEN, presetMarksOverwritten);
+	sessionMap.put(ScratchieConstants.ATTR_DEFAULT_PRESET_MARKS, defaultPresetMarks);
+
 	// init it to avoid null exception in following handling
 	if (items == null) {
 	    items = new ArrayList<ScratchieItem>();
Index: lams_tool_scratchie/web/pages/authoring/advance.jsp
===================================================================
diff -u -rbbe9589ceab063d62380b9fe3f02648a4581e109 -r3a8732a27caaa2eda8712c7a2f24f5788c7d110a
--- lams_tool_scratchie/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision bbe9589ceab063d62380b9fe3f02648a4581e109)
+++ lams_tool_scratchie/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 3a8732a27caaa2eda8712c7a2f24f5788c7d110a)
@@ -9,8 +9,22 @@
 		$("#display-confidence-levels-activities").click(function() {
 			$("#confidence-levels-activity").prop("disabled", !$(this).is(':checked'));
 		});
-
 		<c:if test="${formBean.scratchie.confidenceLevelsActivityUiid == null}">$("#confidence-levels-activity").prop('disabled','disabled'); </c:if>
+		
+		
+		$("#overwrite-preset-marks").click(function() {
+			$("#preset-marks").prop("disabled", !$(this).is(':checked'));
+		});
+		<c:choose>
+			<c:when test="${sessionMap.isPresetMarksOverwritten}">
+				$("#collapseAdvanced").collapse("show");
+			</c:when>
+			<c:otherwise>
+				$("#preset-marks").val("${sessionMap.defaultPresetMarks}"); 
+				$("#preset-marks").prop('disabled','disabled');
+			</c:otherwise>
+		</c:choose>
+		
 	});
 </script>
 
@@ -77,6 +91,31 @@
 	</div>
 </lams:SimplePanel>
 
+<c:set var="adTitle"><fmt:message key="label.change.marking.allocation" /></c:set>
+<lams:AdvancedAccordian title="${adTitle}">
+	<div class="panel-body ">
+		<div class="alert alert-warning">
+			<fmt:message key="label.change.marking.allocation.warning" />
+		</div>
+	
+		<div class="checkbox">
+			<label for="overwrite-preset-marks">
+				<input type="checkbox" id="overwrite-preset-marks"
+					<c:if test="${sessionMap.isPresetMarksOverwritten}">checked="true"</c:if>
+				/>
+				<fmt:message key="label.modify.default.marking" />
+			</label>
+		</div>
+		
+		<div class="form-inline">
+			<label for="preset-marks">
+				<fmt:message key="admin.preset.marks" />&nbsp;
+				<html:text styleId="preset-marks" property="scratchie.presetMarks" size="50" maxlength="255" styleClass="form-control form-control-inline"	/>
+			</label>
+		</div>
+	</div>
+</lams:AdvancedAccordian>
+
 <lams:SimplePanel titleKey="label.activity.completion">
 	<div class="checkbox">
 		<label for="reflect-on">