diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8c3b6e2..4290202b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### Date:       2024-February-05
+### Release:    v2024020501
+
+#### Issue with PeerMark, Rubric, and QuickMark in Moodle 4.3 fixed
+In the previous plugin release we resolved an issue with the EULA modal not launching for students. It has since been discovered that all modals in the plugin were affected by the same issue. This update resolves the issues that users have found with launching the PeerMark, Rubric, and QuickMark managers.
+
 ### Date:       2023-December-19
 ### Release:    v2023121901
 
diff --git a/amd/build/modal_peermark_manager_launch.min.js b/amd/build/modal_peermark_manager_launch.min.js
index abffa562..b4639f4d 100644
--- a/amd/build/modal_peermark_manager_launch.min.js
+++ b/amd/build/modal_peermark_manager_launch.min.js
@@ -1,3 +1,2 @@
-define("plagiarism_turnitin/modal_peermark_manager_launch",["jquery","core/ajax","core/notification","core/custom_interaction_events","core/modal","core/modal_registry","core/modal_events"],(function($,Ajax,Notification,CustomEvents,Modal,ModalRegistry,ModalEvents){var registered=!1,SELECTORS_HIDE_BUTTON='[data-action="hide"]',SELECTORS_MODAL='[data-region="modal"]',ModalPeermarkManagerLaunch=function(root){Modal.call(this,root)};function refreshPeermarkAssignments(){$.ajax({type:"POST",url:M.cfg.wwwroot+"/plagiarism/turnitin/ajax.php",dataType:"json",data:{action:"refresh_peermark_assignments",cmid:$('input[name="coursemodule"]').val(),sesskey:M.cfg.sesskey}})}return ModalPeermarkManagerLaunch.TYPE="plagiarism_turnitin-modal_peermark_manager_launch",(ModalPeermarkManagerLaunch.prototype=Object.create(Modal.prototype)).constructor=ModalPeermarkManagerLaunch,ModalPeermarkManagerLaunch.prototype.registerEventListeners=function(){Modal.prototype.registerEventListeners.call(this),this.getModal().on(CustomEvents.events.activate,SELECTORS_HIDE_BUTTON,function(e,data){var cancelEvent=$.Event(ModalEvents.cancel);this.getRoot().trigger(cancelEvent,this),cancelEvent.isDefaultPrevented()||(this.hide(),data.originalEvent.preventDefault(),refreshPeermarkAssignments())}.bind(this)),this.getRoot().click(function(e){$(e.target).closest(SELECTORS_MODAL).length||refreshPeermarkAssignments()}.bind(this))},registered||(ModalRegistry.register(ModalPeermarkManagerLaunch.TYPE,ModalPeermarkManagerLaunch,"plagiarism_turnitin/modal_peermark_manager_launch"),registered=!0),ModalPeermarkManagerLaunch}));
-
-//# sourceMappingURL=modal_peermark_manager_launch.min.js.map
\ No newline at end of file
+define("plagiarism_turnitin/modal_peermark_manager_launch",["jquery","core/ajax","core/notification","core/custom_interaction_events","core/modal","core/modal_registry","core/modal_events"],function($,Ajax,Notification,CustomEvents,Modal,ModalRegistry,ModalEvents){var registered=false;var SELECTORS={HIDE_BUTTON:'[data-action="hide"]',MODAL:'[data-region="modal"]'};var ModalPeermarkManagerLaunch=function(root){Modal.call(this,root)};ModalPeermarkManagerLaunch.TYPE="plagiarism_turnitin-modal_peermark_manager_launch";ModalPeermarkManagerLaunch.TEMPLATE="plagiarism_turnitin/modal_peermark_manager_launch";ModalPeermarkManagerLaunch.prototype=Object.create(Modal.prototype);ModalPeermarkManagerLaunch.prototype.constructor=ModalPeermarkManagerLaunch;ModalPeermarkManagerLaunch.prototype.registerEventListeners=function(){Modal.prototype.registerEventListeners.call(this);this.getModal().on(CustomEvents.events.activate,SELECTORS.HIDE_BUTTON,function(e,data){var cancelEvent=$.Event(ModalEvents.cancel);this.getRoot().trigger(cancelEvent,this);if(!cancelEvent.isDefaultPrevented()){this.hide();data.originalEvent.preventDefault();refreshPeermarkAssignments()}}.bind(this));this.getRoot().click(function(e){if(!$(e.target).closest(SELECTORS.MODAL).length){refreshPeermarkAssignments()}}.bind(this))};function refreshPeermarkAssignments(){$.ajax({type:"POST",url:M.cfg.wwwroot+"/plagiarism/turnitin/ajax.php",dataType:"json",data:{action:"refresh_peermark_assignments",cmid:$('input[name="coursemodule"]').val(),sesskey:M.cfg.sesskey}})}if(!registered){ModalRegistry.register(ModalPeermarkManagerLaunch.TYPE,ModalPeermarkManagerLaunch,"plagiarism_turnitin/modal_peermark_manager_launch");registered=true}return ModalPeermarkManagerLaunch});
+//# sourcemappingURL=modal_peermark_manager_launch.min.js.map
\ No newline at end of file
diff --git a/amd/build/modal_peermark_manager_launch.min.js.map b/amd/build/modal_peermark_manager_launch.min.js.map
index ab085729..7a26a01f 100644
--- a/amd/build/modal_peermark_manager_launch.min.js.map
+++ b/amd/build/modal_peermark_manager_launch.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"modal_peermark_manager_launch.min.js","sources":["../src/modal_peermark_manager_launch.js"],"sourcesContent":["/**\n * Javascript controller for the Peermark Manager launcher\n *\n * @copyright Turnitin\n * @author 2019 David Winn <dwinn@turnitin.com>\n * @module plagiarism_turnitin/modal_peermark_manager_launch\n */\n\ndefine(\n    [\n        'jquery',\n        'core/ajax',\n        'core/notification',\n        'core/custom_interaction_events',\n        'core/modal',\n        'core/modal_registry',\n        'core/modal_events'\n    ],\n    function($, Ajax, Notification, CustomEvents, Modal, ModalRegistry, ModalEvents) {\n\n        var registered = false;\n        var SELECTORS = {\n            HIDE_BUTTON: '[data-action=\"hide\"]',\n            MODAL: '[data-region=\"modal\"]'\n        };\n\n        /**\n         * Constructor for the Modal.\n         *\n         * @param {object} root The root jQuery element for the modal\n         */\n        var ModalPeermarkManagerLaunch = function(root) {\n            Modal.call(this, root);\n        };\n\n        ModalPeermarkManagerLaunch.TYPE = 'plagiarism_turnitin-modal_peermark_manager_launch';\n        ModalPeermarkManagerLaunch.prototype = Object.create(Modal.prototype);\n        ModalPeermarkManagerLaunch.prototype.constructor = ModalPeermarkManagerLaunch;\n\n        /**\n         * Set up all of the event handling for the modal.\n         *\n         * @method registerEventListeners\n         */\n        ModalPeermarkManagerLaunch.prototype.registerEventListeners = function() {\n            // Apply parent event listeners.\n            Modal.prototype.registerEventListeners.call(this);\n\n            // On cancel, then hide the modal.\n            this.getModal().on(CustomEvents.events.activate, SELECTORS.HIDE_BUTTON, function(e, data) {\n                var cancelEvent = $.Event(ModalEvents.cancel);\n                this.getRoot().trigger(cancelEvent, this);\n\n                if (!cancelEvent.isDefaultPrevented()) {\n                    this.hide();\n                    data.originalEvent.preventDefault();\n\n                    refreshPeermarkAssignments();\n                }\n            }.bind(this));\n\n            // On clicking outside the modal, refresh the Peermark assignments.\n            this.getRoot().click(function(e) {\n                if (!$(e.target).closest(SELECTORS.MODAL).length) {\n                    refreshPeermarkAssignments();\n                }\n            }.bind(this));\n        };\n\n        /**\n         * Method to refresh peermark assignments.\n         */\n        function refreshPeermarkAssignments() {\n            $.ajax({\n                type: \"POST\",\n                url: M.cfg.wwwroot + \"/plagiarism/turnitin/ajax.php\",\n                dataType: \"json\",\n                data: {\n                    action: \"refresh_peermark_assignments\",\n                    cmid: $('input[name=\"coursemodule\"]').val(),\n                    sesskey: M.cfg.sesskey\n                }\n            });\n        }\n\n        // Automatically register with the modal registry the first time this module is imported so that\n        // you can create modals of this type using the modal factory.\n        if (!registered) {\n            ModalRegistry.register(ModalPeermarkManagerLaunch.TYPE,\n                ModalPeermarkManagerLaunch,\n                'plagiarism_turnitin/modal_peermark_manager_launch');\n            registered = true;\n        }\n\n        return ModalPeermarkManagerLaunch;\n    }\n);"],"names":["define","$","Ajax","Notification","CustomEvents","Modal","ModalRegistry","ModalEvents","registered","SELECTORS","ModalPeermarkManagerLaunch","root","call","this","refreshPeermarkAssignments","ajax","type","url","M","cfg","wwwroot","dataType","data","action","cmid","val","sesskey","TYPE","prototype","Object","create","constructor","registerEventListeners","getModal","on","events","activate","e","cancelEvent","Event","cancel","getRoot","trigger","isDefaultPrevented","hide","originalEvent","preventDefault","bind","click","target","closest","length","register"],"mappings":"AAQAA,2DACI,CACI,SACA,YACA,oBACA,iCACA,aACA,sBACA,sBAEJ,SAASC,EAAGC,KAAMC,aAAcC,aAAcC,MAAOC,cAAeC,iBAE5DC,YAAa,EACbC,sBACa,uBADbA,gBAEO,wBAQPC,2BAA6B,SAASC,MACtCN,MAAMO,KAAKC,KAAMF,gBAwCZG,6BACLb,EAAEc,KAAK,CACHC,KAAM,OACNC,IAAKC,EAAEC,IAAIC,QAAU,gCACrBC,SAAU,OACVC,KAAM,CACFC,OAAQ,+BACRC,KAAMvB,EAAE,8BAA8BwB,MACtCC,QAASR,EAAEC,IAAIO,kBA7C3BhB,2BAA2BiB,KAAO,qDAClCjB,2BAA2BkB,UAAYC,OAAOC,OAAOzB,MAAMuB,YACtBG,YAAcrB,2BAOnDA,2BAA2BkB,UAAUI,uBAAyB,WAE1D3B,MAAMuB,UAAUI,uBAAuBpB,KAAKC,WAGvCoB,WAAWC,GAAG9B,aAAa+B,OAAOC,SAAU3B,sBAAuB,SAAS4B,EAAGf,UAC5EgB,YAAcrC,EAAEsC,MAAMhC,YAAYiC,aACjCC,UAAUC,QAAQJ,YAAazB,MAE/ByB,YAAYK,4BACRC,OACLtB,KAAKuB,cAAcC,iBAEnBhC,+BAENiC,KAAKlC,YAGF4B,UAAUO,MAAM,SAASX,GACrBpC,EAAEoC,EAAEY,QAAQC,QAAQzC,iBAAiB0C,QACtCrC,8BAENiC,KAAKlC,QAqBNL,aACDF,cAAc8C,SAAS1C,2BAA2BiB,KAC9CjB,2BACA,qDACJF,YAAa,GAGVE"}
\ No newline at end of file
+{"version":3,"sources":["src/modal_peermark_manager_launch.js"],"names":["define","$","Ajax","Notification","CustomEvents","Modal","ModalRegistry","ModalEvents","registered","SELECTORS","HIDE_BUTTON","MODAL","ModalPeermarkManagerLaunch","root","call","this","TYPE","TEMPLATE","prototype","Object","create","constructor","registerEventListeners","getModal","on","events","activate","e","data","cancelEvent","Event","cancel","getRoot","trigger","isDefaultPrevented","hide","originalEvent","preventDefault","refreshPeermarkAssignments","bind","click","target","closest","length","ajax","type","url","M","cfg","wwwroot","dataType","action","cmid","val","sesskey","register"],"mappings":"AAQAA,OACI,CACI,SACA,YACA,oBACA,iCACA,aACA,sBACA,qBAEJ,SAASC,EAAGC,KAAMC,aAAcC,aAAcC,MAAOC,cAAeC,aAEhE,IAAIC,WAAa,MACjB,IAAIC,UAAY,CACZC,YAAa,uBACbC,MAAO,uBACX,EAOA,IAAIC,2BAA6B,SAASC,MACtCR,MAAMS,KAAKC,KAAMF,IAAI,CACzB,EAEAD,2BAA2BI,KAAO,oDAClCJ,2BAA2BK,SAAW,oDACtCL,2BAA2BM,UAAYC,OAAOC,OAAOf,MAAMa,SAAS,EACpEN,2BAA2BM,UAAUG,YAAcT,2BAOnDA,2BAA2BM,UAAUI,uBAAyB,WAE1DjB,MAAMa,UAAUI,uBAAuBR,KAAKC,IAAI,EAGhDA,KAAKQ,SAAS,EAAEC,GAAGpB,aAAaqB,OAAOC,SAAUjB,UAAUC,YAAa,SAASiB,EAAGC,MAChF,IAAIC,YAAc5B,EAAE6B,MAAMvB,YAAYwB,MAAM,EAC5ChB,KAAKiB,QAAQ,EAAEC,QAAQJ,YAAad,IAAI,EAExC,GAAI,CAACc,YAAYK,mBAAmB,EAAG,CACnCnB,KAAKoB,KAAK,EACVP,KAAKQ,cAAcC,eAAe,EAElCC,2BAA2B,CAC/B,CACJ,EAAEC,KAAKxB,IAAI,CAAC,EAGZA,KAAKiB,QAAQ,EAAEQ,MAAM,SAASb,GAC1B,GAAI,CAAC1B,EAAE0B,EAAEc,MAAM,EAAEC,QAAQjC,UAAUE,KAAK,EAAEgC,OAAQ,CAC9CL,2BAA2B,CAC/B,CACJ,EAAEC,KAAKxB,IAAI,CAAC,CAChB,EAKA,SAASuB,6BACLrC,EAAE2C,KAAK,CACHC,KAAM,OACNC,IAAKC,EAAEC,IAAIC,QAAU,gCACrBC,SAAU,OACVtB,KAAM,CACFuB,OAAQ,+BACRC,KAAMnD,EAAE,4BAA4B,EAAEoD,IAAI,EAC1CC,QAASP,EAAEC,IAAIM,OACnB,CACJ,CAAC,CACL,CAIA,GAAI,CAAC9C,WAAY,CACbF,cAAciD,SAAS3C,2BAA2BI,KAC9CJ,2BACA,mDAAmD,EACvDJ,WAAa,IACjB,CAEA,OAAOI,0BACX,CACJ"}
\ No newline at end of file
diff --git a/amd/build/modal_peermark_reviews_launch.min.js b/amd/build/modal_peermark_reviews_launch.min.js
index 67c49f14..9d193914 100644
--- a/amd/build/modal_peermark_reviews_launch.min.js
+++ b/amd/build/modal_peermark_reviews_launch.min.js
@@ -1,3 +1,2 @@
-define("plagiarism_turnitin/modal_peermark_reviews_launch",["jquery","core/ajax","core/notification","core/custom_interaction_events","core/modal","core/modal_registry","core/modal_events"],(function($,Ajax,Notification,CustomEvents,Modal,ModalRegistry,ModalEvents){var registered=!1,SELECTORS_HIDE_BUTTON='[data-action="hide"]',ModalPeermarkReviewsLaunch=function(root){Modal.call(this,root)};return ModalPeermarkReviewsLaunch.TYPE="plagiarism_turnitin-modal_peermark_reviews_launch",(ModalPeermarkReviewsLaunch.prototype=Object.create(Modal.prototype)).constructor=ModalPeermarkReviewsLaunch,ModalPeermarkReviewsLaunch.prototype.registerEventListeners=function(){Modal.prototype.registerEventListeners.call(this),this.getModal().on(CustomEvents.events.activate,SELECTORS_HIDE_BUTTON,function(e,data){var cancelEvent=$.Event(ModalEvents.cancel);this.getRoot().trigger(cancelEvent,this),cancelEvent.isDefaultPrevented()||(this.hide(),data.originalEvent.preventDefault())}.bind(this))},registered||(ModalRegistry.register(ModalPeermarkReviewsLaunch.TYPE,ModalPeermarkReviewsLaunch,"plagiarism_turnitin/modal_peermark_reviews_launch"),registered=!0),ModalPeermarkReviewsLaunch}));
-
+define("plagiarism_turnitin/modal_peermark_reviews_launch",["jquery","core/ajax","core/notification","core/custom_interaction_events","core/modal","core/modal_registry","core/modal_events"],function($,Ajax,Notification,CustomEvents,Modal,ModalRegistry,ModalEvents){var registered=false;var SELECTORS={HIDE_BUTTON:'[data-action="hide"]',MODAL:'[data-region="modal"]'};var ModalPeermarkReviewsLaunch=function(root){Modal.call(this,root)};ModalPeermarkReviewsLaunch.TYPE="plagiarism_turnitin-modal_peermark_reviews_launch";ModalPeermarkReviewsLaunch.TEMPLATE="plagiarism_turnitin/modal_peermark_reviews_launch";ModalPeermarkReviewsLaunch.prototype=Object.create(Modal.prototype);ModalPeermarkReviewsLaunch.prototype.constructor=ModalPeermarkReviewsLaunch;ModalPeermarkReviewsLaunch.prototype.registerEventListeners=function(){Modal.prototype.registerEventListeners.call(this);this.getModal().on(CustomEvents.events.activate,SELECTORS.HIDE_BUTTON,function(e,data){var cancelEvent=$.Event(ModalEvents.cancel);this.getRoot().trigger(cancelEvent,this);if(!cancelEvent.isDefaultPrevented()){this.hide();data.originalEvent.preventDefault()}}.bind(this))};if(!registered){ModalRegistry.register(ModalPeermarkReviewsLaunch.TYPE,ModalPeermarkReviewsLaunch,"plagiarism_turnitin/modal_peermark_reviews_launch");registered=true}return ModalPeermarkReviewsLaunch});
 //# sourceMappingURL=modal_peermark_reviews_launch.min.js.map
\ No newline at end of file
diff --git a/amd/build/modal_peermark_reviews_launch.min.js.map b/amd/build/modal_peermark_reviews_launch.min.js.map
index 2c94b996..f5d73c4d 100644
--- a/amd/build/modal_peermark_reviews_launch.min.js.map
+++ b/amd/build/modal_peermark_reviews_launch.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"modal_peermark_reviews_launch.min.js","sources":["../src/modal_peermark_reviews_launch.js"],"sourcesContent":["/**\n * Javascript controller for Peermark Reviews launcher\n *\n * @copyright Turnitin\n * @author 2019 David Winn <dwinn@turnitin.com>\n * @module plagiarism_turnitin/modal_peermark_reviews_launch\n */\n\ndefine(\n    [\n        'jquery',\n        'core/ajax',\n        'core/notification',\n        'core/custom_interaction_events',\n        'core/modal',\n        'core/modal_registry',\n        'core/modal_events'\n    ],\n    function($, Ajax, Notification, CustomEvents, Modal, ModalRegistry, ModalEvents) {\n\n        var registered = false;\n        var SELECTORS = {\n            HIDE_BUTTON: '[data-action=\"hide\"]',\n            MODAL: '[data-region=\"modal\"]'\n        };\n\n        /**\n         * Constructor for the Modal.\n         *\n         * @param {object} root The root jQuery element for the modal\n         */\n        var ModalPeermarkReviewsLaunch = function(root) {\n            Modal.call(this, root);\n        };\n\n        ModalPeermarkReviewsLaunch.TYPE = 'plagiarism_turnitin-modal_peermark_reviews_launch';\n        ModalPeermarkReviewsLaunch.prototype = Object.create(Modal.prototype);\n        ModalPeermarkReviewsLaunch.prototype.constructor = ModalPeermarkReviewsLaunch;\n\n        /**\n         * Set up all of the event handling for the modal.\n         *\n         * @method registerEventListeners\n         */\n        ModalPeermarkReviewsLaunch.prototype.registerEventListeners = function() {\n            // Apply parent event listeners.\n            Modal.prototype.registerEventListeners.call(this);\n\n            // On cancel, then hide the modal.\n            this.getModal().on(CustomEvents.events.activate, SELECTORS.HIDE_BUTTON, function(e, data) {\n                var cancelEvent = $.Event(ModalEvents.cancel);\n                this.getRoot().trigger(cancelEvent, this);\n\n                if (!cancelEvent.isDefaultPrevented()) {\n                    this.hide();\n                    data.originalEvent.preventDefault();\n                }\n            }.bind(this));\n        };\n\n        // Automatically register with the modal registry the first time this module is imported so that\n        // you can create modals of this type using the modal factory.\n        if (!registered) {\n            ModalRegistry.register(ModalPeermarkReviewsLaunch.TYPE,\n                ModalPeermarkReviewsLaunch,\n                'plagiarism_turnitin/modal_peermark_reviews_launch');\n            registered = true;\n        }\n\n        return ModalPeermarkReviewsLaunch;\n    }\n);"],"names":["define","$","Ajax","Notification","CustomEvents","Modal","ModalRegistry","ModalEvents","registered","SELECTORS","ModalPeermarkReviewsLaunch","root","call","this","TYPE","prototype","Object","create","constructor","registerEventListeners","getModal","on","events","activate","e","data","cancelEvent","Event","cancel","getRoot","trigger","isDefaultPrevented","hide","originalEvent","preventDefault","bind","register"],"mappings":"AAQAA,2DACI,CACI,SACA,YACA,oBACA,iCACA,aACA,sBACA,sBAEJ,SAASC,EAAGC,KAAMC,aAAcC,aAAcC,MAAOC,cAAeC,iBAE5DC,YAAa,EACbC,sBACa,uBASbC,2BAA6B,SAASC,MACtCN,MAAMO,KAAKC,KAAMF,cAGrBD,2BAA2BI,KAAO,qDAClCJ,2BAA2BK,UAAYC,OAAOC,OAAOZ,MAAMU,YACtBG,YAAcR,2BAOnDA,2BAA2BK,UAAUI,uBAAyB,WAE1Dd,MAAMU,UAAUI,uBAAuBP,KAAKC,WAGvCO,WAAWC,GAAGjB,aAAakB,OAAOC,SAAUd,sBAAuB,SAASe,EAAGC,UAC5EC,YAAczB,EAAE0B,MAAMpB,YAAYqB,aACjCC,UAAUC,QAAQJ,YAAab,MAE/Ba,YAAYK,4BACRC,OACLP,KAAKQ,cAAcC,mBAEzBC,KAAKtB,QAKNL,aACDF,cAAc8B,SAAS1B,2BAA2BI,KAC9CJ,2BACA,qDACJF,YAAa,GAGVE"}
\ No newline at end of file
+{"version":3,"sources":["src/modal_peermark_reviews_launch.js"],"names":["define","$","Ajax","Notification","CustomEvents","Modal","ModalRegistry","ModalEvents","registered","SELECTORS","HIDE_BUTTON","MODAL","ModalPeermarkReviewsLaunch","root","call","this","TYPE","TEMPLATE","prototype","Object","create","constructor","registerEventListeners","getModal","on","events","activate","e","data","cancelEvent","Event","cancel","getRoot","trigger","isDefaultPrevented","hide","originalEvent","preventDefault","bind","register"],"mappings":"AAQAA,OACI,CACI,SACA,YACA,oBACA,iCACA,aACA,sBACA,qBAEJ,SAASC,EAAGC,KAAMC,aAAcC,aAAcC,MAAOC,cAAeC,aAEhE,IAAIC,WAAa,MACjB,IAAIC,UAAY,CACZC,YAAa,uBACbC,MAAO,uBACX,EAOA,IAAIC,2BAA6B,SAASC,MACtCR,MAAMS,KAAKC,KAAMF,IAAI,CACzB,EAEAD,2BAA2BI,KAAO,oDAClCJ,2BAA2BK,SAAW,oDACtCL,2BAA2BM,UAAYC,OAAOC,OAAOf,MAAMa,SAAS,EACpEN,2BAA2BM,UAAUG,YAAcT,2BAOnDA,2BAA2BM,UAAUI,uBAAyB,WAE1DjB,MAAMa,UAAUI,uBAAuBR,KAAKC,IAAI,EAGhDA,KAAKQ,SAAS,EAAEC,GAAGpB,aAAaqB,OAAOC,SAAUjB,UAAUC,YAAa,SAASiB,EAAGC,MAChF,IAAIC,YAAc5B,EAAE6B,MAAMvB,YAAYwB,MAAM,EAC5ChB,KAAKiB,QAAQ,EAAEC,QAAQJ,YAAad,IAAI,EAExC,GAAI,CAACc,YAAYK,mBAAmB,EAAG,CACnCnB,KAAKoB,KAAK,EACVP,KAAKQ,cAAcC,eAAe,CACtC,CACJ,EAAEC,KAAKvB,IAAI,CAAC,CAChB,EAIA,GAAI,CAACP,WAAY,CACbF,cAAciC,SAAS3B,2BAA2BI,KAC9CJ,2BACA,mDAAmD,EACvDJ,WAAa,IACjB,CAEA,OAAOI,0BACX,CACJ"}
\ No newline at end of file
diff --git a/amd/build/modal_quickmark_launch.min.js b/amd/build/modal_quickmark_launch.min.js
index c89d1174..937e6689 100644
--- a/amd/build/modal_quickmark_launch.min.js
+++ b/amd/build/modal_quickmark_launch.min.js
@@ -1,3 +1,2 @@
-define("plagiarism_turnitin/modal_quickmark_launch",["jquery","core/ajax","core/notification","core/custom_interaction_events","core/modal","core/modal_registry","core/modal_events"],(function($,Ajax,Notification,CustomEvents,Modal,ModalRegistry,ModalEvents){var registered=!1,SELECTORS_HIDE_BUTTON='[data-action="hide"]',ModalQuickmarkLaunch=function(root){Modal.call(this,root)};return ModalQuickmarkLaunch.TYPE="plagiarism_turnitin-modal_quickmark_launch",(ModalQuickmarkLaunch.prototype=Object.create(Modal.prototype)).constructor=ModalQuickmarkLaunch,ModalQuickmarkLaunch.prototype.registerEventListeners=function(){Modal.prototype.registerEventListeners.call(this),this.getModal().on(CustomEvents.events.activate,SELECTORS_HIDE_BUTTON,function(e,data){var cancelEvent=$.Event(ModalEvents.cancel);this.getRoot().trigger(cancelEvent,this),cancelEvent.isDefaultPrevented()||(this.hide(),data.originalEvent.preventDefault())}.bind(this))},registered||(ModalRegistry.register(ModalQuickmarkLaunch.TYPE,ModalQuickmarkLaunch,"plagiarism_turnitin/modal_quickmark_launch"),registered=!0),ModalQuickmarkLaunch}));
-
+define("plagiarism_turnitin/modal_quickmark_launch",["jquery","core/ajax","core/notification","core/custom_interaction_events","core/modal","core/modal_registry","core/modal_events"],function($,Ajax,Notification,CustomEvents,Modal,ModalRegistry,ModalEvents){var registered=false;var SELECTORS={HIDE_BUTTON:'[data-action="hide"]',MODAL:'[data-region="modal"]'};var ModalQuickmarkLaunch=function(root){Modal.call(this,root)};ModalQuickmarkLaunch.TYPE="plagiarism_turnitin-modal_quickmark_launch";ModalQuickmarkLaunch.TEMPLATE="plagiarism_turnitin/modal_quickmark_launch";ModalQuickmarkLaunch.prototype=Object.create(Modal.prototype);ModalQuickmarkLaunch.prototype.constructor=ModalQuickmarkLaunch;ModalQuickmarkLaunch.prototype.registerEventListeners=function(){Modal.prototype.registerEventListeners.call(this);this.getModal().on(CustomEvents.events.activate,SELECTORS.HIDE_BUTTON,function(e,data){var cancelEvent=$.Event(ModalEvents.cancel);this.getRoot().trigger(cancelEvent,this);if(!cancelEvent.isDefaultPrevented()){this.hide();data.originalEvent.preventDefault()}}.bind(this))};if(!registered){ModalRegistry.register(ModalQuickmarkLaunch.TYPE,ModalQuickmarkLaunch,"plagiarism_turnitin/modal_quickmark_launch");registered=true}return ModalQuickmarkLaunch});
 //# sourceMappingURL=modal_quickmark_launch.min.js.map
\ No newline at end of file
diff --git a/amd/build/modal_quickmark_launch.min.js.map b/amd/build/modal_quickmark_launch.min.js.map
index abf085cb..5c10a2d9 100644
--- a/amd/build/modal_quickmark_launch.min.js.map
+++ b/amd/build/modal_quickmark_launch.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"modal_quickmark_launch.min.js","sources":["../src/modal_quickmark_launch.js"],"sourcesContent":["/**\n * Javascript controller for Quickmark launcher\n *\n * @copyright Turnitin\n * @author 2019 David Winn <dwinn@turnitin.com>\n * @module plagiarism_turnitin/modal_quickmark_launch\n */\n\ndefine(\n    [\n        'jquery',\n        'core/ajax',\n        'core/notification',\n        'core/custom_interaction_events',\n        'core/modal',\n        'core/modal_registry',\n        'core/modal_events'\n    ],\n    function($, Ajax, Notification, CustomEvents, Modal, ModalRegistry, ModalEvents) {\n\n        var registered = false;\n        var SELECTORS = {\n            HIDE_BUTTON: '[data-action=\"hide\"]',\n            MODAL: '[data-region=\"modal\"]'\n        };\n\n        /**\n         * Constructor for the Modal.\n         *\n         * @param {object} root The root jQuery element for the modal\n         */\n        var ModalQuickmarkLaunch = function(root) {\n            Modal.call(this, root);\n        };\n\n        ModalQuickmarkLaunch.TYPE = 'plagiarism_turnitin-modal_quickmark_launch';\n        ModalQuickmarkLaunch.prototype = Object.create(Modal.prototype);\n        ModalQuickmarkLaunch.prototype.constructor = ModalQuickmarkLaunch;\n\n        /**\n         * Set up all of the event handling for the modal.\n         *\n         * @method registerEventListeners\n         */\n        ModalQuickmarkLaunch.prototype.registerEventListeners = function() {\n            // Apply parent event listeners.\n            Modal.prototype.registerEventListeners.call(this);\n\n            // On cancel, then hide the modal.\n            this.getModal().on(CustomEvents.events.activate, SELECTORS.HIDE_BUTTON, function(e, data) {\n                var cancelEvent = $.Event(ModalEvents.cancel);\n                this.getRoot().trigger(cancelEvent, this);\n\n                if (!cancelEvent.isDefaultPrevented()) {\n                    this.hide();\n                    data.originalEvent.preventDefault();\n                }\n            }.bind(this));\n        };\n\n        // Automatically register with the modal registry the first time this module is imported so that\n        // you can create modals of this type using the modal factory.\n        if (!registered) {\n            ModalRegistry.register(ModalQuickmarkLaunch.TYPE, ModalQuickmarkLaunch, 'plagiarism_turnitin/modal_quickmark_launch');\n            registered = true;\n        }\n\n        return ModalQuickmarkLaunch;\n    }\n);"],"names":["define","$","Ajax","Notification","CustomEvents","Modal","ModalRegistry","ModalEvents","registered","SELECTORS","ModalQuickmarkLaunch","root","call","this","TYPE","prototype","Object","create","constructor","registerEventListeners","getModal","on","events","activate","e","data","cancelEvent","Event","cancel","getRoot","trigger","isDefaultPrevented","hide","originalEvent","preventDefault","bind","register"],"mappings":"AAQAA,oDACI,CACI,SACA,YACA,oBACA,iCACA,aACA,sBACA,sBAEJ,SAASC,EAAGC,KAAMC,aAAcC,aAAcC,MAAOC,cAAeC,iBAE5DC,YAAa,EACbC,sBACa,uBASbC,qBAAuB,SAASC,MAChCN,MAAMO,KAAKC,KAAMF,cAGrBD,qBAAqBI,KAAO,8CAC5BJ,qBAAqBK,UAAYC,OAAOC,OAAOZ,MAAMU,YACtBG,YAAcR,qBAO7CA,qBAAqBK,UAAUI,uBAAyB,WAEpDd,MAAMU,UAAUI,uBAAuBP,KAAKC,WAGvCO,WAAWC,GAAGjB,aAAakB,OAAOC,SAAUd,sBAAuB,SAASe,EAAGC,UAC5EC,YAAczB,EAAE0B,MAAMpB,YAAYqB,aACjCC,UAAUC,QAAQJ,YAAab,MAE/Ba,YAAYK,4BACRC,OACLP,KAAKQ,cAAcC,mBAEzBC,KAAKtB,QAKNL,aACDF,cAAc8B,SAAS1B,qBAAqBI,KAAMJ,qBAAsB,8CACxEF,YAAa,GAGVE"}
\ No newline at end of file
+{"version":3,"sources":["src/modal_quickmark_launch.js"],"names":["define","$","Ajax","Notification","CustomEvents","Modal","ModalRegistry","ModalEvents","registered","SELECTORS","HIDE_BUTTON","MODAL","ModalQuickmarkLaunch","root","call","this","TYPE","TEMPLATE","prototype","Object","create","constructor","registerEventListeners","getModal","on","events","activate","e","data","cancelEvent","Event","cancel","getRoot","trigger","isDefaultPrevented","hide","originalEvent","preventDefault","bind","register"],"mappings":"AAQAA,OACI,CACI,SACA,YACA,oBACA,iCACA,aACA,sBACA,qBAEJ,SAASC,EAAGC,KAAMC,aAAcC,aAAcC,MAAOC,cAAeC,aAEhE,IAAIC,WAAa,MACjB,IAAIC,UAAY,CACZC,YAAa,uBACbC,MAAO,uBACX,EAOA,IAAIC,qBAAuB,SAASC,MAChCR,MAAMS,KAAKC,KAAMF,IAAI,CACzB,EAEAD,qBAAqBI,KAAO,6CAC5BJ,qBAAqBK,SAAW,6CAChCL,qBAAqBM,UAAYC,OAAOC,OAAOf,MAAMa,SAAS,EAC9DN,qBAAqBM,UAAUG,YAAcT,qBAO7CA,qBAAqBM,UAAUI,uBAAyB,WAEpDjB,MAAMa,UAAUI,uBAAuBR,KAAKC,IAAI,EAGhDA,KAAKQ,SAAS,EAAEC,GAAGpB,aAAaqB,OAAOC,SAAUjB,UAAUC,YAAa,SAASiB,EAAGC,MAChF,IAAIC,YAAc5B,EAAE6B,MAAMvB,YAAYwB,MAAM,EAC5ChB,KAAKiB,QAAQ,EAAEC,QAAQJ,YAAad,IAAI,EAExC,GAAI,CAACc,YAAYK,mBAAmB,EAAG,CACnCnB,KAAKoB,KAAK,EACVP,KAAKQ,cAAcC,eAAe,CACtC,CACJ,EAAEC,KAAKvB,IAAI,CAAC,CAChB,EAIA,GAAI,CAACP,WAAY,CACbF,cAAciC,SAAS3B,qBAAqBI,KAAMJ,qBAAsB,4CAA4C,EACpHJ,WAAa,IACjB,CAEA,OAAOI,oBACX,CACJ"}
\ No newline at end of file
diff --git a/amd/build/modal_rubric_manager_launch.min.js b/amd/build/modal_rubric_manager_launch.min.js
index 4ac313fa..c12020c5 100644
--- a/amd/build/modal_rubric_manager_launch.min.js
+++ b/amd/build/modal_rubric_manager_launch.min.js
@@ -1,3 +1,2 @@
-define("plagiarism_turnitin/modal_rubric_manager_launch",["jquery","core/ajax","core/notification","core/custom_interaction_events","core/modal","core/modal_registry","core/modal_events"],(function($,Ajax,Notification,CustomEvents,Modal,ModalRegistry,ModalEvents){var registered=!1,SELECTORS_HIDE_BUTTON='[data-action="hide"]',SELECTORS_MODAL='[data-region="modal"]',ModalRubricManagerLaunch=function(root){Modal.call(this,root)};function refreshRubricSelect(){var currentRubric=$("#id_plagiarism_rubric").val();$.ajax({dataType:"json",type:"POST",url:"../plagiarism/turnitin/ajax.php",data:{action:"refresh_rubric_select",assignment:$('input[name="instance"]').val(),modulename:$('input[name="modulename"]').val(),course:$('input[name="course"]').val()},success:function(data){$($("#id_plagiarism_rubric")).empty();var options=data;$.each(options,(function(i,val){if($.isNumeric(i)||""===i)$($("#id_plagiarism_rubric")).append($("<option>",{value:i,text:val}));else{var optgroup=$("<optgroup>");optgroup.attr("label",i),$.each(val,(function(j,rubric){var option=$("<option></option>");option.val(j),option.text(rubric),optgroup.append(option)})),$("#id_plagiarism_rubric").append(optgroup)}})),$('#id_plagiarism_rubric option[value="'+currentRubric+'"]').attr("selected","selected")}})}return ModalRubricManagerLaunch.TYPE="plagiarism_turnitin-modal_rubric_manager_launch",(ModalRubricManagerLaunch.prototype=Object.create(Modal.prototype)).constructor=ModalRubricManagerLaunch,ModalRubricManagerLaunch.prototype.registerEventListeners=function(){Modal.prototype.registerEventListeners.call(this),this.getModal().on(CustomEvents.events.activate,SELECTORS_HIDE_BUTTON,function(e,data){var cancelEvent=$.Event(ModalEvents.cancel);this.getRoot().trigger(cancelEvent,this),cancelEvent.isDefaultPrevented()||(this.hide(),data.originalEvent.preventDefault(),refreshRubricSelect())}.bind(this)),this.getRoot().click(function(e){$(e.target).closest(SELECTORS_MODAL).length||refreshRubricSelect()}.bind(this))},registered||(ModalRegistry.register(ModalRubricManagerLaunch.TYPE,ModalRubricManagerLaunch,"plagiarism_turnitin/modal_rubric_manager_launch"),registered=!0),ModalRubricManagerLaunch}));
-
+define("plagiarism_turnitin/modal_rubric_manager_launch",["jquery","core/ajax","core/notification","core/custom_interaction_events","core/modal","core/modal_registry","core/modal_events"],function($,Ajax,Notification,CustomEvents,Modal,ModalRegistry,ModalEvents){var registered=false;var SELECTORS={HIDE_BUTTON:'[data-action="hide"]',MODAL:'[data-region="modal"]'};var ModalRubricManagerLaunch=function(root){Modal.call(this,root)};ModalRubricManagerLaunch.TYPE="plagiarism_turnitin-modal_rubric_manager_launch";ModalRubricManagerLaunch.TEMPLATE="plagiarism_turnitin/modal_rubric_manager_launch";ModalRubricManagerLaunch.prototype=Object.create(Modal.prototype);ModalRubricManagerLaunch.prototype.constructor=ModalRubricManagerLaunch;ModalRubricManagerLaunch.prototype.registerEventListeners=function(){Modal.prototype.registerEventListeners.call(this);this.getModal().on(CustomEvents.events.activate,SELECTORS.HIDE_BUTTON,function(e,data){var cancelEvent=$.Event(ModalEvents.cancel);this.getRoot().trigger(cancelEvent,this);if(!cancelEvent.isDefaultPrevented()){this.hide();data.originalEvent.preventDefault();refreshRubricSelect()}}.bind(this));this.getRoot().click(function(e){if(!$(e.target).closest(SELECTORS.MODAL).length){refreshRubricSelect()}}.bind(this))};function refreshRubricSelect(){var currentRubric=$("#id_plagiarism_rubric").val();$.ajax({dataType:"json",type:"POST",url:"../plagiarism/turnitin/ajax.php",data:{action:"refresh_rubric_select",assignment:$('input[name="instance"]').val(),modulename:$('input[name="modulename"]').val(),course:$('input[name="course"]').val()},success:function(data){$($("#id_plagiarism_rubric")).empty();var options=data;$.each(options,function(i,val){if(!$.isNumeric(i)&&i!==""){var optgroup=$("<optgroup>");optgroup.attr("label",i);$.each(val,function(j,rubric){var option=$("<option></option>");option.val(j);option.text(rubric);optgroup.append(option)});$("#id_plagiarism_rubric").append(optgroup)}else{$($("#id_plagiarism_rubric")).append($("<option>",{value:i,text:val}))}});$("#id_plagiarism_rubric"+' option[value="'+currentRubric+'"]').attr("selected","selected")}})}if(!registered){ModalRegistry.register(ModalRubricManagerLaunch.TYPE,ModalRubricManagerLaunch,"plagiarism_turnitin/modal_rubric_manager_launch");registered=true}return ModalRubricManagerLaunch});
 //# sourceMappingURL=modal_rubric_manager_launch.min.js.map
\ No newline at end of file
diff --git a/amd/build/modal_rubric_manager_launch.min.js.map b/amd/build/modal_rubric_manager_launch.min.js.map
index 85760873..77d73da7 100644
--- a/amd/build/modal_rubric_manager_launch.min.js.map
+++ b/amd/build/modal_rubric_manager_launch.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"modal_rubric_manager_launch.min.js","sources":["../src/modal_rubric_manager_launch.js"],"sourcesContent":["/**\n * Javascript controller for the Rubric Manager launcher\n *\n * @copyright Turnitin\n * @author 2019 David Winn <dwinn@turnitin.com>\n * @module plagiarism_turnitin/modal_rubric_manager_launch\n */\n\ndefine(\n    [\n        'jquery',\n        'core/ajax',\n        'core/notification',\n        'core/custom_interaction_events',\n        'core/modal',\n        'core/modal_registry',\n        'core/modal_events'\n    ],\n    function($, Ajax, Notification, CustomEvents, Modal, ModalRegistry, ModalEvents) {\n\n        var registered = false;\n        var SELECTORS = {\n            HIDE_BUTTON: '[data-action=\"hide\"]',\n            MODAL: '[data-region=\"modal\"]'\n        };\n\n        /**\n         * Constructor for the Modal.\n         *\n         * @param {object} root The root jQuery element for the modal\n         */\n        var ModalRubricManagerLaunch = function(root) {\n            Modal.call(this, root);\n        };\n\n        ModalRubricManagerLaunch.TYPE = 'plagiarism_turnitin-modal_rubric_manager_launch';\n        ModalRubricManagerLaunch.prototype = Object.create(Modal.prototype);\n        ModalRubricManagerLaunch.prototype.constructor = ModalRubricManagerLaunch;\n\n        /**\n         * Set up all of the event handling for the modal.\n         *\n         * @method registerEventListeners\n         */\n        ModalRubricManagerLaunch.prototype.registerEventListeners = function() {\n            // Apply parent event listeners.\n            Modal.prototype.registerEventListeners.call(this);\n\n            // On cancel, then hide the modal.\n            this.getModal().on(CustomEvents.events.activate, SELECTORS.HIDE_BUTTON, function(e, data) {\n                var cancelEvent = $.Event(ModalEvents.cancel);\n                this.getRoot().trigger(cancelEvent, this);\n\n                if (!cancelEvent.isDefaultPrevented()) {\n                    this.hide();\n                    data.originalEvent.preventDefault();\n\n                    refreshRubricSelect();\n                }\n            }.bind(this));\n\n            // On clicking outside the modal, refresh the Rubrics.\n            this.getRoot().click(function(e) {\n                if (!$(e.target).closest(SELECTORS.MODAL).length) {\n                    refreshRubricSelect();\n                }\n            }.bind(this));\n        };\n\n        /**\n         * Get the rubrics belonging to a user from Turnitin and refresh menu accordingly.\n         */\n        function refreshRubricSelect() {\n            var currentRubric = $('#id_plagiarism_rubric').val();\n            $.ajax({\n                \"dataType\": 'json',\n                \"type\": \"POST\",\n                \"url\": \"../plagiarism/turnitin/ajax.php\",\n                \"data\": {\n                    action: \"refresh_rubric_select\", assignment: $('input[name=\"instance\"]').val(),\n                    modulename: $('input[name=\"modulename\"]').val(), course: $('input[name=\"course\"]').val()\n                },\n                success: function (data) {\n                    $($('#id_plagiarism_rubric')).empty();\n                    var options = data;\n                    $.each(options, function (i, val) {\n                        if (!$.isNumeric(i) && i !== \"\") {\n\n                            var optgroup = $('<optgroup>');\n                            optgroup.attr('label', i);\n\n                            $.each(val, function (j, rubric) {\n                                var option = $(\"<option></option>\");\n                                option.val(j);\n                                option.text(rubric);\n\n                                optgroup.append(option);\n                            });\n\n                            $('#id_plagiarism_rubric').append(optgroup);\n\n                        } else {\n                            $($('#id_plagiarism_rubric')).append($('<option>', {\n                                value: i,\n                                text: val\n                            }));\n                        }\n                    });\n\n                    $('#id_plagiarism_rubric' + ' option[value=\"' + currentRubric + '\"]').attr(\"selected\", \"selected\");\n                }\n            });\n        }\n\n        // Automatically register with the modal registry the first time this module is imported so that\n        // you can create modals of this type using the modal factory.\n        if (!registered) {\n            ModalRegistry.register(ModalRubricManagerLaunch.TYPE,\n                ModalRubricManagerLaunch,\n                'plagiarism_turnitin/modal_rubric_manager_launch');\n            registered = true;\n        }\n\n        return ModalRubricManagerLaunch;\n    }\n);"],"names":["define","$","Ajax","Notification","CustomEvents","Modal","ModalRegistry","ModalEvents","registered","SELECTORS","ModalRubricManagerLaunch","root","call","this","refreshRubricSelect","currentRubric","val","ajax","action","assignment","modulename","course","success","data","empty","options","each","i","isNumeric","append","value","text","optgroup","attr","j","rubric","option","TYPE","prototype","Object","create","constructor","registerEventListeners","getModal","on","events","activate","e","cancelEvent","Event","cancel","getRoot","trigger","isDefaultPrevented","hide","originalEvent","preventDefault","bind","click","target","closest","length","register"],"mappings":"AAQAA,yDACI,CACI,SACA,YACA,oBACA,iCACA,aACA,sBACA,sBAEJ,SAASC,EAAGC,KAAMC,aAAcC,aAAcC,MAAOC,cAAeC,iBAE5DC,YAAa,EACbC,sBACa,uBADbA,gBAEO,wBAQPC,yBAA2B,SAASC,MACpCN,MAAMO,KAAKC,KAAMF,gBAwCZG,0BACDC,cAAgBd,EAAE,yBAAyBe,MAC/Cf,EAAEgB,KAAK,UACS,YACJ,WACD,uCACC,CACJC,OAAQ,wBAAyBC,WAAYlB,EAAE,0BAA0Be,MACzEI,WAAYnB,EAAE,4BAA4Be,MAAOK,OAAQpB,EAAE,wBAAwBe,OAEvFM,QAAS,SAAUC,MACftB,EAAEA,EAAE,0BAA0BuB,YAC1BC,QAAUF,KACdtB,EAAEyB,KAAKD,SAAS,SAAUE,EAAGX,QACpBf,EAAE2B,UAAUD,IAAY,KAANA,EAgBnB1B,EAAEA,EAAE,0BAA0B4B,OAAO5B,EAAE,WAAY,CAC/C6B,MAAOH,EACPI,KAAMf,WAlBmB,KAEzBgB,SAAW/B,EAAE,cACjB+B,SAASC,KAAK,QAASN,GAEvB1B,EAAEyB,KAAKV,KAAK,SAAUkB,EAAGC,YACjBC,OAASnC,EAAE,qBACfmC,OAAOpB,IAAIkB,GACXE,OAAOL,KAAKI,QAEZH,SAASH,OAAOO,WAGpBnC,EAAE,yBAAyB4B,OAAOG,cAU1C/B,EAAE,uCAA8Cc,cAAgB,MAAMkB,KAAK,WAAY,sBA1EnGvB,yBAAyB2B,KAAO,mDAChC3B,yBAAyB4B,UAAYC,OAAOC,OAAOnC,MAAMiC,YACtBG,YAAc/B,yBAOjDA,yBAAyB4B,UAAUI,uBAAyB,WAExDrC,MAAMiC,UAAUI,uBAAuB9B,KAAKC,WAGvC8B,WAAWC,GAAGxC,aAAayC,OAAOC,SAAUrC,sBAAuB,SAASsC,EAAGxB,UAC5EyB,YAAc/C,EAAEgD,MAAM1C,YAAY2C,aACjCC,UAAUC,QAAQJ,YAAanC,MAE/BmC,YAAYK,4BACRC,OACL/B,KAAKgC,cAAcC,iBAEnB1C,wBAEN2C,KAAK5C,YAGFsC,UAAUO,MAAM,SAASX,GACrB9C,EAAE8C,EAAEY,QAAQC,QAAQnD,iBAAiBoD,QACtC/C,uBAEN2C,KAAK5C,QAkDNL,aACDF,cAAcwD,SAASpD,yBAAyB2B,KAC5C3B,yBACA,mDACJF,YAAa,GAGVE"}
\ No newline at end of file
+{"version":3,"sources":["src/modal_rubric_manager_launch.js"],"names":["define","$","Ajax","Notification","CustomEvents","Modal","ModalRegistry","ModalEvents","registered","SELECTORS","HIDE_BUTTON","MODAL","ModalRubricManagerLaunch","root","call","this","TYPE","TEMPLATE","prototype","Object","create","constructor","registerEventListeners","getModal","on","events","activate","e","data","cancelEvent","Event","cancel","getRoot","trigger","isDefaultPrevented","hide","originalEvent","preventDefault","refreshRubricSelect","bind","click","target","closest","length","currentRubric","val","ajax","dataType","type","url","action","assignment","modulename","course","success","empty","options","each","i","isNumeric","optgroup","attr","j","rubric","option","text","append","value","register"],"mappings":"AAQAA,OACI,CACI,SACA,YACA,oBACA,iCACA,aACA,sBACA,qBAEJ,SAASC,EAAGC,KAAMC,aAAcC,aAAcC,MAAOC,cAAeC,aAEhE,IAAIC,WAAa,MACjB,IAAIC,UAAY,CACZC,YAAa,uBACbC,MAAO,uBACX,EAOA,IAAIC,yBAA2B,SAASC,MACpCR,MAAMS,KAAKC,KAAMF,IAAI,CACzB,EAEAD,yBAAyBI,KAAO,kDAChCJ,yBAAyBK,SAAW,kDACpCL,yBAAyBM,UAAYC,OAAOC,OAAOf,MAAMa,SAAS,EAClEN,yBAAyBM,UAAUG,YAAcT,yBAOjDA,yBAAyBM,UAAUI,uBAAyB,WAExDjB,MAAMa,UAAUI,uBAAuBR,KAAKC,IAAI,EAGhDA,KAAKQ,SAAS,EAAEC,GAAGpB,aAAaqB,OAAOC,SAAUjB,UAAUC,YAAa,SAASiB,EAAGC,MAChF,IAAIC,YAAc5B,EAAE6B,MAAMvB,YAAYwB,MAAM,EAC5ChB,KAAKiB,QAAQ,EAAEC,QAAQJ,YAAad,IAAI,EAExC,GAAI,CAACc,YAAYK,mBAAmB,EAAG,CACnCnB,KAAKoB,KAAK,EACVP,KAAKQ,cAAcC,eAAe,EAElCC,oBAAoB,CACxB,CACJ,EAAEC,KAAKxB,IAAI,CAAC,EAGZA,KAAKiB,QAAQ,EAAEQ,MAAM,SAASb,GAC1B,GAAI,CAAC1B,EAAE0B,EAAEc,MAAM,EAAEC,QAAQjC,UAAUE,KAAK,EAAEgC,OAAQ,CAC9CL,oBAAoB,CACxB,CACJ,EAAEC,KAAKxB,IAAI,CAAC,CAChB,EAKA,SAASuB,sBACL,IAAIM,cAAgB3C,EAAE,uBAAuB,EAAE4C,IAAI,EACnD5C,EAAE6C,KAAK,CACHC,SAAY,OACZC,KAAQ,OACRC,IAAO,kCACPrB,KAAQ,CACJsB,OAAQ,wBAAyBC,WAAYlD,EAAE,wBAAwB,EAAE4C,IAAI,EAC7EO,WAAYnD,EAAE,0BAA0B,EAAE4C,IAAI,EAAGQ,OAAQpD,EAAE,sBAAsB,EAAE4C,IAAI,CAC3F,EACAS,QAAS,SAAU1B,MACf3B,EAAEA,EAAE,uBAAuB,CAAC,EAAEsD,MAAM,EACpC,IAAIC,QAAU5B,KACd3B,EAAEwD,KAAKD,QAAS,SAAUE,EAAGb,KACzB,GAAI,CAAC5C,EAAE0D,UAAUD,CAAC,GAAKA,IAAM,GAAI,CAE7B,IAAIE,SAAW3D,EAAE,YAAY,EAC7B2D,SAASC,KAAK,QAASH,CAAC,EAExBzD,EAAEwD,KAAKZ,IAAK,SAAUiB,EAAGC,QACrB,IAAIC,OAAS/D,EAAE,mBAAmB,EAClC+D,OAAOnB,IAAIiB,CAAC,EACZE,OAAOC,KAAKF,MAAM,EAElBH,SAASM,OAAOF,MAAM,CAC1B,CAAC,EAED/D,EAAE,uBAAuB,EAAEiE,OAAON,QAAQ,CAE9C,KAAO,CACH3D,EAAEA,EAAE,uBAAuB,CAAC,EAAEiE,OAAOjE,EAAE,WAAY,CAC/CkE,MAAOT,EACPO,KAAMpB,GACV,CAAC,CAAC,CACN,CACJ,CAAC,EAED5C,EAAE,wBAA0B,kBAAoB2C,cAAgB,IAAI,EAAEiB,KAAK,WAAY,UAAU,CACrG,CACJ,CAAC,CACL,CAIA,GAAI,CAACrD,WAAY,CACbF,cAAc8D,SAASxD,yBAAyBI,KAC5CJ,yBACA,iDAAiD,EACrDJ,WAAa,IACjB,CAEA,OAAOI,wBACX,CACJ"}
\ No newline at end of file
diff --git a/amd/build/modal_rubric_view_launch.min.js b/amd/build/modal_rubric_view_launch.min.js
index 9861d833..a80e6de3 100644
--- a/amd/build/modal_rubric_view_launch.min.js
+++ b/amd/build/modal_rubric_view_launch.min.js
@@ -1,3 +1,2 @@
-define("plagiarism_turnitin/modal_rubric_view_launch",["jquery","core/ajax","core/notification","core/custom_interaction_events","core/modal","core/modal_registry","core/modal_events"],(function($,Ajax,Notification,CustomEvents,Modal,ModalRegistry,ModalEvents){var registered=!1,SELECTORS_HIDE_BUTTON='[data-action="hide"]',ModalRubricViewLaunch=function(root){Modal.call(this,root)};return ModalRubricViewLaunch.TYPE="plagiarism_turnitin-modal_rubric_view_launch",(ModalRubricViewLaunch.prototype=Object.create(Modal.prototype)).constructor=ModalRubricViewLaunch,ModalRubricViewLaunch.prototype.registerEventListeners=function(){Modal.prototype.registerEventListeners.call(this),this.getModal().on(CustomEvents.events.activate,SELECTORS_HIDE_BUTTON,function(e,data){var cancelEvent=$.Event(ModalEvents.cancel);this.getRoot().trigger(cancelEvent,this),cancelEvent.isDefaultPrevented()||(this.hide(),data.originalEvent.preventDefault())}.bind(this))},registered||(ModalRegistry.register(ModalRubricViewLaunch.TYPE,ModalRubricViewLaunch,"plagiarism_turnitin/modal_rubric_view_launch"),registered=!0),ModalRubricViewLaunch}));
-
+define("plagiarism_turnitin/modal_rubric_view_launch",["jquery","core/ajax","core/notification","core/custom_interaction_events","core/modal","core/modal_registry","core/modal_events"],function($,Ajax,Notification,CustomEvents,Modal,ModalRegistry,ModalEvents){var registered=false;var SELECTORS={HIDE_BUTTON:'[data-action="hide"]',MODAL:'[data-region="modal"]'};var ModalRubricViewLaunch=function(root){Modal.call(this,root)};ModalRubricViewLaunch.TYPE="plagiarism_turnitin-modal_rubric_view_launch";ModalRubricViewLaunch.TEMPLATE="plagiarism_turnitin/modal_rubric_view_launch";ModalRubricViewLaunch.prototype=Object.create(Modal.prototype);ModalRubricViewLaunch.prototype.constructor=ModalRubricViewLaunch;ModalRubricViewLaunch.prototype.registerEventListeners=function(){Modal.prototype.registerEventListeners.call(this);this.getModal().on(CustomEvents.events.activate,SELECTORS.HIDE_BUTTON,function(e,data){var cancelEvent=$.Event(ModalEvents.cancel);this.getRoot().trigger(cancelEvent,this);if(!cancelEvent.isDefaultPrevented()){this.hide();data.originalEvent.preventDefault()}}.bind(this))};if(!registered){ModalRegistry.register(ModalRubricViewLaunch.TYPE,ModalRubricViewLaunch,"plagiarism_turnitin/modal_rubric_view_launch");registered=true}return ModalRubricViewLaunch});
 //# sourceMappingURL=modal_rubric_view_launch.min.js.map
\ No newline at end of file
diff --git a/amd/build/modal_rubric_view_launch.min.js.map b/amd/build/modal_rubric_view_launch.min.js.map
index aaa16f38..ad65378f 100644
--- a/amd/build/modal_rubric_view_launch.min.js.map
+++ b/amd/build/modal_rubric_view_launch.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"modal_rubric_view_launch.min.js","sources":["../src/modal_rubric_view_launch.js"],"sourcesContent":["/**\n * Javascript controller for Rubric View launcher\n *\n * @copyright Turnitin\n * @author 2019 David Winn <dwinn@turnitin.com>\n * @module plagiarism_turnitin/modal_rubric_view_launch\n */\n\ndefine(\n    [\n        'jquery',\n        'core/ajax',\n        'core/notification',\n        'core/custom_interaction_events',\n        'core/modal',\n        'core/modal_registry',\n        'core/modal_events'\n    ],\n    function($, Ajax, Notification, CustomEvents, Modal, ModalRegistry, ModalEvents) {\n\n        var registered = false;\n        var SELECTORS = {\n            HIDE_BUTTON: '[data-action=\"hide\"]',\n            MODAL: '[data-region=\"modal\"]'\n        };\n\n        /**\n         * Constructor for the Modal.\n         *\n         * @param {object} root The root jQuery element for the modal\n         */\n        var ModalRubricViewLaunch = function(root) {\n            Modal.call(this, root);\n        };\n\n        ModalRubricViewLaunch.TYPE = 'plagiarism_turnitin-modal_rubric_view_launch';\n        ModalRubricViewLaunch.prototype = Object.create(Modal.prototype);\n        ModalRubricViewLaunch.prototype.constructor = ModalRubricViewLaunch;\n\n        /**\n         * Set up all of the event handling for the modal.\n         *\n         * @method registerEventListeners\n         */\n        ModalRubricViewLaunch.prototype.registerEventListeners = function() {\n            // Apply parent event listeners.\n            Modal.prototype.registerEventListeners.call(this);\n\n            // On cancel, then hide the modal.\n            this.getModal().on(CustomEvents.events.activate, SELECTORS.HIDE_BUTTON, function(e, data) {\n                var cancelEvent = $.Event(ModalEvents.cancel);\n                this.getRoot().trigger(cancelEvent, this);\n\n                if (!cancelEvent.isDefaultPrevented()) {\n                    this.hide();\n                    data.originalEvent.preventDefault();\n                }\n            }.bind(this));\n        };\n\n        // Automatically register with the modal registry the first time this module is imported so that\n        // you can create modals of this type using the modal factory.\n        if (!registered) {\n            ModalRegistry.register(ModalRubricViewLaunch.TYPE,\n                ModalRubricViewLaunch,\n                'plagiarism_turnitin/modal_rubric_view_launch');\n            registered = true;\n        }\n\n        return ModalRubricViewLaunch;\n    }\n);"],"names":["define","$","Ajax","Notification","CustomEvents","Modal","ModalRegistry","ModalEvents","registered","SELECTORS","ModalRubricViewLaunch","root","call","this","TYPE","prototype","Object","create","constructor","registerEventListeners","getModal","on","events","activate","e","data","cancelEvent","Event","cancel","getRoot","trigger","isDefaultPrevented","hide","originalEvent","preventDefault","bind","register"],"mappings":"AAQAA,sDACI,CACI,SACA,YACA,oBACA,iCACA,aACA,sBACA,sBAEJ,SAASC,EAAGC,KAAMC,aAAcC,aAAcC,MAAOC,cAAeC,iBAE5DC,YAAa,EACbC,sBACa,uBASbC,sBAAwB,SAASC,MACjCN,MAAMO,KAAKC,KAAMF,cAGrBD,sBAAsBI,KAAO,gDAC7BJ,sBAAsBK,UAAYC,OAAOC,OAAOZ,MAAMU,YACtBG,YAAcR,sBAO9CA,sBAAsBK,UAAUI,uBAAyB,WAErDd,MAAMU,UAAUI,uBAAuBP,KAAKC,WAGvCO,WAAWC,GAAGjB,aAAakB,OAAOC,SAAUd,sBAAuB,SAASe,EAAGC,UAC5EC,YAAczB,EAAE0B,MAAMpB,YAAYqB,aACjCC,UAAUC,QAAQJ,YAAab,MAE/Ba,YAAYK,4BACRC,OACLP,KAAKQ,cAAcC,mBAEzBC,KAAKtB,QAKNL,aACDF,cAAc8B,SAAS1B,sBAAsBI,KACzCJ,sBACA,gDACJF,YAAa,GAGVE"}
\ No newline at end of file
+{"version":3,"sources":["src/modal_rubric_view_launch.js"],"names":["define","$","Ajax","Notification","CustomEvents","Modal","ModalRegistry","ModalEvents","registered","SELECTORS","HIDE_BUTTON","MODAL","ModalRubricViewLaunch","root","call","this","TYPE","TEMPLATE","prototype","Object","create","constructor","registerEventListeners","getModal","on","events","activate","e","data","cancelEvent","Event","cancel","getRoot","trigger","isDefaultPrevented","hide","originalEvent","preventDefault","bind","register"],"mappings":"AAQAA,OACI,CACI,SACA,YACA,oBACA,iCACA,aACA,sBACA,qBAEJ,SAASC,EAAGC,KAAMC,aAAcC,aAAcC,MAAOC,cAAeC,aAEhE,IAAIC,WAAa,MACjB,IAAIC,UAAY,CACZC,YAAa,uBACbC,MAAO,uBACX,EAOA,IAAIC,sBAAwB,SAASC,MACjCR,MAAMS,KAAKC,KAAMF,IAAI,CACzB,EAEAD,sBAAsBI,KAAO,+CAC7BJ,sBAAsBK,SAAW,+CACjCL,sBAAsBM,UAAYC,OAAOC,OAAOf,MAAMa,SAAS,EAC/DN,sBAAsBM,UAAUG,YAAcT,sBAO9CA,sBAAsBM,UAAUI,uBAAyB,WAErDjB,MAAMa,UAAUI,uBAAuBR,KAAKC,IAAI,EAGhDA,KAAKQ,SAAS,EAAEC,GAAGpB,aAAaqB,OAAOC,SAAUjB,UAAUC,YAAa,SAASiB,EAAGC,MAChF,IAAIC,YAAc5B,EAAE6B,MAAMvB,YAAYwB,MAAM,EAC5ChB,KAAKiB,QAAQ,EAAEC,QAAQJ,YAAad,IAAI,EAExC,GAAI,CAACc,YAAYK,mBAAmB,EAAG,CACnCnB,KAAKoB,KAAK,EACVP,KAAKQ,cAAcC,eAAe,CACtC,CACJ,EAAEC,KAAKvB,IAAI,CAAC,CAChB,EAIA,GAAI,CAACP,WAAY,CACbF,cAAciC,SAAS3B,sBAAsBI,KACzCJ,sBACA,8CAA8C,EAClDJ,WAAa,IACjB,CAEA,OAAOI,qBACX,CACJ"}
\ No newline at end of file
diff --git a/amd/build/new_peermark.min.js b/amd/build/new_peermark.min.js
new file mode 100644
index 00000000..4f302dea
--- /dev/null
+++ b/amd/build/new_peermark.min.js
@@ -0,0 +1,2 @@
+define("plagiarism_turnitin/newPeermarkLaunch",["jquery","core/templates","core/modal","core/modal_events","plagiarism_turnitin/modal_peermark_manager_launch","plagiarism_turnitin/modal_peermark_reviews_launch"],function($,Templates,Modal,ModalEvents,ModalPeermarkManagerLaunch,ModalPeermarkReviewsLaunch){return{newPeermarkLaunch:function(){var that=this;$(".peermark_manager_launch").on("click",function(event){event.preventDefault();that.peermarkModalCreate(ModalPeermarkManagerLaunch)});$(document).on("click",".peermark_reviews_pp_launch",function(){that.peermarkModalCreate(ModalPeermarkReviewsLaunch)})},peermarkModalCreate:function(modalType){if($('input[name="coursemodule"]').val()){var cmid=$('input[name="coursemodule"]').val()}else{var urlParams=new URLSearchParams(window.location.search);var cmid=urlParams.get("id")}Modal.create({type:modalType.TYPE,template:modalType.TEMPLATE,templateContext:{cmid:cmid,wwwroot:M.cfg.wwwroot},large:true}).then(function(modal){modal.show()})}}});
+//# sourceMappingURL=new_peermark.min.js.map
\ No newline at end of file
diff --git a/amd/build/new_peermark.min.js.map b/amd/build/new_peermark.min.js.map
new file mode 100644
index 00000000..f24b0654
--- /dev/null
+++ b/amd/build/new_peermark.min.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["src/new_peermark.js"],"names":["define","$","Templates","Modal","ModalEvents","ModalPeermarkManagerLaunch","ModalPeermarkReviewsLaunch","newPeermarkLaunch","that","this","on","event","preventDefault","peermarkModalCreate","document","modalType","val","cmid","urlParams","URLSearchParams","window","location","search","get","create","type","TYPE","template","TEMPLATE","templateContext","wwwroot","M","cfg","large","then","modal","show"],"mappings":"AAQAA,OAAO,CAAC,SACA,iBACA,aACA,oBACA,oDACA,qDAEJ,SAASC,EAAGC,UAAWC,MAAOC,YAAaC,2BAA4BC,4BACnE,MAAO,CACHC,kBAAmB,WACf,IAAIC,KAAOC,KACXR,EAAE,0BAA0B,EAAES,GAAG,QAAS,SAASC,OAC/CA,MAAMC,eAAe,EACrBJ,KAAKK,oBAAoBR,0BAA0B,CACvD,CAAC,EAEDJ,EAAEa,QAAQ,EAAEJ,GAAG,QAAS,8BAA+B,WACnDF,KAAKK,oBAAoBP,0BAA0B,CACvD,CAAC,CACL,EACAO,oBAAqB,SAASE,WAE1B,GAAId,EAAE,4BAA4B,EAAEe,IAAI,EAAG,CACvC,IAAIC,KAAOhB,EAAE,4BAA4B,EAAEe,IAAI,CACnD,KAAO,CACH,IAAIE,UAAY,IAAIC,gBAAgBC,OAAOC,SAASC,MAAM,EAC1D,IAAIL,KAAOC,UAAUK,IAAI,IAAI,CACjC,CACApB,MAAMqB,OAAO,CACTC,KAAMV,UAAUW,KAChBC,SAAUZ,UAAUa,SACpBC,gBAAiB,CACbZ,KAAMA,KACNa,QAASC,EAAEC,IAAIF,OACnB,EACAG,MAAO,IACX,CAAC,EACIC,KAAK,SAAUC,OACZA,MAAMC,KAAK,CACf,CAAC,CACT,CACJ,CACJ,CAAC"}
\ No newline at end of file
diff --git a/amd/build/new_quickmark.min.js b/amd/build/new_quickmark.min.js
new file mode 100644
index 00000000..edb08d31
--- /dev/null
+++ b/amd/build/new_quickmark.min.js
@@ -0,0 +1,2 @@
+define("plagiarism_turnitin/newQuickmarkLaunch",["jquery","core/templates","core/modal","core/modal_events","plagiarism_turnitin/modal_quickmark_launch"],function($,Templates,Modal,ModalEvents,ModalQuickmarkLaunch){return{newQuickmarkLaunch:function(){$(".plagiarism_turnitin_quickmark_manager_launch").on("click",function(event){event.preventDefault();Modal.create({type:ModalQuickmarkLaunch.TYPE,template:ModalQuickmarkLaunch.TEMPLATE,templateContext:{cmid:$('input[name="coursemodule"]').val(),wwwroot:M.cfg.wwwroot},large:true}).then(function(modal){modal.show()})})}}});
+//# sourceMappingURL=new_quickmark.min.js.map
\ No newline at end of file
diff --git a/amd/build/new_quickmark.min.js.map b/amd/build/new_quickmark.min.js.map
new file mode 100644
index 00000000..2eace873
--- /dev/null
+++ b/amd/build/new_quickmark.min.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["src/new_quickmark.js"],"names":["define","$","Templates","Modal","ModalEvents","ModalQuickmarkLaunch","newQuickmarkLaunch","on","event","preventDefault","create","type","TYPE","template","TEMPLATE","templateContext","cmid","val","wwwroot","M","cfg","large","then","modal","show"],"mappings":"AAQAA,OAAO,CAAC,SACA,iBACA,aACA,oBACA,8CAEJ,SAASC,EAAGC,UAAWC,MAAOC,YAAaC,sBACvC,MAAO,CACHC,mBAAoB,WAChBL,EAAE,+CAA+C,EAAEM,GAAG,QAAS,SAAUC,OACrEA,MAAMC,eAAe,EACrBN,MAAMO,OAAO,CACTC,KAAMN,qBAAqBO,KAC3BC,SAAUR,qBAAqBS,SAC/BC,gBAAiB,CACbC,KAAMf,EAAE,4BAA4B,EAAEgB,IAAI,EAC1CC,QAASC,EAAEC,IAAIF,OACnB,EACAG,MAAO,IACX,CAAC,EACIC,KAAK,SAAUC,OACZA,MAAMC,KAAK,CACf,CAAC,CACT,CAAC,CACL,CACJ,CACJ,CAAC"}
\ No newline at end of file
diff --git a/amd/build/new_rubric.min.js b/amd/build/new_rubric.min.js
new file mode 100644
index 00000000..e7b5b379
--- /dev/null
+++ b/amd/build/new_rubric.min.js
@@ -0,0 +1,2 @@
+define("plagiarism_turnitin/newRubric",["jquery","core/templates","core/modal","core/modal_events","plagiarism_turnitin/modal_rubric_manager_launch","plagiarism_turnitin/modal_rubric_view_launch"],function($,Templates,Modal,ModalEvents,ModalRubricManagerLaunch,ModalRubricViewLaunch){return{newRubric:function(){var that=this;$(".rubric_manager_launch").on("click",function(){var courseid=$(this).data("courseid");var cmid=$(this).data("cmid");that.rubricCreateModal(ModalRubricManagerLaunch,courseid,cmid)});$(document).on("click",".rubric_view",function(){var courseid=$(this).data("courseid");var cmid=$(this).data("cmid");that.rubricCreateModal(ModalRubricViewLaunch,courseid,cmid)});$("#id_plagiarism_rubric").mousedown(function(){if($('input[name="instance"]').val()!=""&&$('input[name="rubric_warning_seen"]').val()!="Y"){if(confirm(M.str.plagiarism_turnitin.changerubricwarning)){$('input[name="rubric_warning_seen"]').val("Y")}}})},rubricCreateModal:function(modalType,courseid,cmid){Modal.create({type:modalType.TYPE,template:modalType.TEMPLATE,templateContext:{courseid:courseid,cmid:cmid,wwwroot:M.cfg.wwwroot},large:true}).then(function(modal){modal.show();modal.getRoot().find(".modal").addClass("tii_pp_modal_rubric");modal.getRoot().find(".modal-content").addClass("tii_pp_modal_rubric_content")})}}});
+//# sourceMappingURL=new_rubric.min.js.map
\ No newline at end of file
diff --git a/amd/build/new_rubric.min.js.map b/amd/build/new_rubric.min.js.map
new file mode 100644
index 00000000..7b45a9c8
--- /dev/null
+++ b/amd/build/new_rubric.min.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["src/new_rubric.js"],"names":["define","$","Templates","Modal","ModalEvents","ModalRubricManagerLaunch","ModalRubricViewLaunch","newRubric","that","this","on","courseid","data","cmid","rubricCreateModal","document","mousedown","val","confirm","M","str","plagiarism_turnitin","changerubricwarning","modalType","create","type","TYPE","template","TEMPLATE","templateContext","wwwroot","cfg","large","then","modal","show","getRoot","find","addClass"],"mappings":"AAQAA,OAAO,CAAC,SACA,iBACA,aACA,oBACA,kDACA,gDAEJ,SAASC,EAAGC,UAAWC,MAAOC,YAAaC,yBAA0BC,uBACjE,MAAO,CACHC,UAAW,WACP,IAAIC,KAAOC,KACXR,EAAE,wBAAwB,EAAES,GAAG,QAAS,WACpC,IAAIC,SAAWV,EAAEQ,IAAI,EAAEG,KAAK,UAAU,EACtC,IAAIC,KAAOZ,EAAEQ,IAAI,EAAEG,KAAK,MAAM,EAC9BJ,KAAKM,kBAAkBT,yBAA0BM,SAAUE,IAAI,CACnE,CAAC,EAEDZ,EAAEc,QAAQ,EAAEL,GAAG,QAAS,eAAgB,WACpC,IAAIC,SAAWV,EAAEQ,IAAI,EAAEG,KAAK,UAAU,EACtC,IAAIC,KAAOZ,EAAEQ,IAAI,EAAEG,KAAK,MAAM,EAC9BJ,KAAKM,kBAAkBR,sBAAuBK,SAAUE,IAAI,CAChE,CAAC,EAGDZ,EAAE,uBAAuB,EAAEe,UAAU,WACjC,GAAIf,EAAE,wBAAwB,EAAEgB,IAAI,GAAK,IAAMhB,EAAE,mCAAmC,EAAEgB,IAAI,GAAK,IAAK,CAChG,GAAIC,QAAQC,EAAEC,IAAIC,oBAAoBC,mBAAmB,EAAG,CACxDrB,EAAE,mCAAmC,EAAEgB,IAAI,GAAG,CAClD,CACJ,CACJ,CAAC,CACL,EACAH,kBAAmB,SAASS,UAAWZ,SAAUE,MAC7CV,MAAMqB,OAAO,CACTC,KAAMF,UAAUG,KAChBC,SAAUJ,UAAUK,SACpBC,gBAAiB,CACblB,SAAUA,SACVE,KAAMA,KACNiB,QAASX,EAAEY,IAAID,OACnB,EACAE,MAAO,IACX,CAAC,EACIC,KAAK,SAAUC,OACZA,MAAMC,KAAK,EACXD,MAAME,QAAQ,EAAEC,KAAK,QAAQ,EAAEC,SAAS,qBAAqB,EAC7DJ,MAAME,QAAQ,EAAEC,KAAK,gBAAgB,EAAEC,SAAS,6BAA6B,CACjF,CAAC,CACT,CACJ,CACJ,CAAC"}
\ No newline at end of file
diff --git a/amd/build/peermark.min.js b/amd/build/peermark.min.js
index dd46aba4..80255ee3 100644
--- a/amd/build/peermark.min.js
+++ b/amd/build/peermark.min.js
@@ -1,2 +1,2 @@
-define(["jquery","core/templates","core/modal","core/modal_events","plagiarism_turnitin/modal_peermark_manager_launch","plagiarism_turnitin/modal_peermark_reviews_launch"],function($,Templates,Modal,ModalEvents,ModalPeermarkManagerLaunch,ModalPeermarkReviewsLaunch){return{peermarkLaunch:function(){var that=this;$(".peermark_manager_launch").on("click",function(event){event.preventDefault();that.peermarkCreateModal(ModalPeermarkManagerLaunch.TYPE)});$(document).on("click",".peermark_reviews_pp_launch",function(){that.peermarkCreateModal(ModalPeermarkReviewsLaunch.TYPE)})},peermarkCreateModal:function(modalType){if($('input[name="coursemodule"]').val()){var cmid=$('input[name="coursemodule"]').val()}else{var urlParams=new URLSearchParams(window.location.search);var cmid=urlParams.get("id")}Modal.create({type:modalType,templateContext:{cmid:cmid,wwwroot:M.cfg.wwwroot},large:true}).then(function(modal){modal.show()})}}});
+define("plagiarism_turnitin/peermarkLaunch",["jquery","core/templates","core/modal_factory","core/modal_events","plagiarism_turnitin/modal_peermark_manager_launch","plagiarism_turnitin/modal_peermark_reviews_launch"],function($,Templates,ModalFactory,ModalEvents,ModalPeermarkManagerLaunch,ModalPeermarkReviewsLaunch){return{peermarkLaunch:function(){var that=this;$(".peermark_manager_launch").on("click",function(event){event.preventDefault();that.peermarkCreateModal(ModalPeermarkManagerLaunch)});$(document).on("click",".peermark_reviews_pp_launch",function(){that.peermarkCreateModal(ModalPeermarkReviewsLaunch)})},peermarkCreateModal:function(modalType){if($('input[name="coursemodule"]').val()){var cmid=$('input[name="coursemodule"]').val()}else{var urlParams=new URLSearchParams(window.location.search);var cmid=urlParams.get("id")}ModalFactory.create({type:modalType.TYPE,templateContext:{cmid:cmid,wwwroot:M.cfg.wwwroot},large:true}).then(function(modal){modal.show()})}}});
 //# sourceMappingURL=peermark.min.js.map
\ No newline at end of file
diff --git a/amd/build/peermark.min.js.map b/amd/build/peermark.min.js.map
index 44d7459f..b4dc35a3 100644
--- a/amd/build/peermark.min.js.map
+++ b/amd/build/peermark.min.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../src/peermark.js"],"names":["define","$","Templates","Modal","ModalEvents","ModalPeermarkManagerLaunch","ModalPeermarkReviewsLaunch","peermarkLaunch","that","this","on","event","preventDefault","peermarkCreateModal","TYPE","document","modalType","val","cmid","urlParams","URLSearchParams","window","location","search","get","create","type","templateContext","wwwroot","M","cfg","large","then","modal","show"],"mappings":"AAQAA,OAAO,CAAC,SACA,iBACA,aACA,oBACA,oDACA,qDAEJ,SAASC,EAAGC,UAAWC,MAAOC,YAAaC,2BAA4BC,4BACnE,MAAO,CACHC,eAAgB,WACZ,IAAIC,KAAOC,KACXR,EAAE,0BAA0B,EAAES,GAAG,QAAS,SAASC,OAC/CA,MAAMC,eAAe,EACrBJ,KAAKK,oBAAoBR,2BAA2BS,IAAI,CAC5D,CAAC,EAEDb,EAAEc,QAAQ,EAAEL,GAAG,QAAS,8BAA+B,WACnDF,KAAKK,oBAAoBP,2BAA2BQ,IAAI,CAC5D,CAAC,CACL,EACAD,oBAAqB,SAASG,WAE1B,GAAIf,EAAE,4BAA4B,EAAEgB,IAAI,EAAG,CACvC,IAAIC,KAAOjB,EAAE,4BAA4B,EAAEgB,IAAI,CACnD,KAAO,CACH,IAAIE,UAAY,IAAIC,gBAAgBC,OAAOC,SAASC,MAAM,EAC1D,IAAIL,KAAOC,UAAUK,IAAI,IAAI,CACjC,CACArB,MAAMsB,OAAO,CACTC,KAAMV,UACNW,gBAAiB,CACbT,KAAMA,KACNU,QAASC,EAAEC,IAAIF,OACnB,EACAG,MAAO,IACX,CAAC,EACIC,KAAK,SAAUC,OACZA,MAAMC,KAAK,CACf,CAAC,CACT,CACJ,CACJ,CAAC"}
\ No newline at end of file
+{"version":3,"sources":["src/peermark.js"],"names":["define","$","Templates","ModalFactory","ModalEvents","ModalPeermarkManagerLaunch","ModalPeermarkReviewsLaunch","peermarkLaunch","that","this","on","event","preventDefault","peermarkCreateModal","document","modalType","val","cmid","urlParams","URLSearchParams","window","location","search","get","create","type","TYPE","templateContext","wwwroot","M","cfg","large","then","modal","show"],"mappings":"AAQAA,OAAO,CAAC,SACA,iBACA,qBACA,oBACA,oDACA,qDAEJ,SAASC,EAAGC,UAAWC,aAAcC,YAAaC,2BAA4BC,4BAC1E,MAAO,CACHC,eAAgB,WACZ,IAAIC,KAAOC,KACXR,EAAE,0BAA0B,EAAES,GAAG,QAAS,SAASC,OAC/CA,MAAMC,eAAe,EACrBJ,KAAKK,oBAAoBR,0BAA0B,CACvD,CAAC,EAEDJ,EAAEa,QAAQ,EAAEJ,GAAG,QAAS,8BAA+B,WACnDF,KAAKK,oBAAoBP,0BAA0B,CACvD,CAAC,CACL,EACAO,oBAAqB,SAASE,WAE1B,GAAId,EAAE,4BAA4B,EAAEe,IAAI,EAAG,CACvC,IAAIC,KAAOhB,EAAE,4BAA4B,EAAEe,IAAI,CACnD,KAAO,CACH,IAAIE,UAAY,IAAIC,gBAAgBC,OAAOC,SAASC,MAAM,EAC1D,IAAIL,KAAOC,UAAUK,IAAI,IAAI,CACjC,CACApB,aAAaqB,OAAO,CAChBC,KAAMV,UAAUW,KAChBC,gBAAiB,CACbV,KAAMA,KACNW,QAASC,EAAEC,IAAIF,OACnB,EACAG,MAAO,IACX,CAAC,EACIC,KAAK,SAAUC,OACZA,MAAMC,KAAK,CACf,CAAC,CACT,CACJ,CACJ,CAAC"}
\ No newline at end of file
diff --git a/amd/build/quickmark.min.js b/amd/build/quickmark.min.js
index 9a28d1c5..abc77766 100644
--- a/amd/build/quickmark.min.js
+++ b/amd/build/quickmark.min.js
@@ -1,2 +1,2 @@
-define(["jquery","core/templates","core/modal","core/modal_events","plagiarism_turnitin/modal_quickmark_launch"],function($,Templates,Modal,ModalEvents,ModalQuickmarkLaunch){return{quickmarkLaunch:function(){$(".plagiarism_turnitin_quickmark_manager_launch").on("click",function(event){event.preventDefault();Modal.create({type:ModalQuickmarkLaunch.TYPE,templateContext:{cmid:$('input[name="coursemodule"]').val(),wwwroot:M.cfg.wwwroot},large:true}).then(function(modal){modal.show()})})}}});
+define("plagiarism_turnitin/quickmarkLaunch",["jquery","core/templates","core/modal_factory","core/modal_events","plagiarism_turnitin/modal_quickmark_launch"],function($,Templates,ModalFactory,ModalEvents,ModalQuickmarkLaunch){return{quickmarkLaunch:function(){$(".plagiarism_turnitin_quickmark_manager_launch").on("click",function(event){event.preventDefault();ModalFactory.create({type:ModalQuickmarkLaunch.TYPE,templateContext:{cmid:$('input[name="coursemodule"]').val(),wwwroot:M.cfg.wwwroot},large:true}).then(function(modal){modal.show()})})}}});
 //# sourceMappingURL=quickmark.min.js.map
\ No newline at end of file
diff --git a/amd/build/quickmark.min.js.map b/amd/build/quickmark.min.js.map
index ffa51f0f..053cb711 100644
--- a/amd/build/quickmark.min.js.map
+++ b/amd/build/quickmark.min.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../src/quickmark.js"],"names":["define","$","Templates","Modal","ModalEvents","ModalQuickmarkLaunch","quickmarkLaunch","on","event","preventDefault","create","type","TYPE","templateContext","cmid","val","wwwroot","M","cfg","large","then","modal","show"],"mappings":"AAQAA,OAAO,CAAC,SACA,iBACA,aACA,oBACA,8CAEJ,SAASC,EAAGC,UAAWC,MAAOC,YAAaC,sBACvC,MAAO,CACHC,gBAAiB,WACbL,EAAE,+CAA+C,EAAEM,GAAG,QAAS,SAAUC,OACrEA,MAAMC,eAAe,EACrBN,MAAMO,OAAO,CACTC,KAAMN,qBAAqBO,KAC3BC,gBAAiB,CACbC,KAAMb,EAAE,4BAA4B,EAAEc,IAAI,EAC1CC,QAASC,EAAEC,IAAIF,OACnB,EACAG,MAAO,IACX,CAAC,EACIC,KAAK,SAAUC,OACZA,MAAMC,KAAK,CACf,CAAC,CACT,CAAC,CACL,CACJ,CACJ,CAAC"}
\ No newline at end of file
+{"version":3,"sources":["src/quickmark.js"],"names":["define","$","Templates","ModalFactory","ModalEvents","ModalQuickmarkLaunch","quickmarkLaunch","on","event","preventDefault","create","type","TYPE","templateContext","cmid","val","wwwroot","M","cfg","large","then","modal","show"],"mappings":"AAQAA,OAAO,CAAC,SACA,iBACA,qBACA,oBACA,8CAEJ,SAASC,EAAGC,UAAWC,aAAcC,YAAaC,sBAC9C,MAAO,CACHC,gBAAiB,WACbL,EAAE,+CAA+C,EAAEM,GAAG,QAAS,SAAUC,OACrEA,MAAMC,eAAe,EACrBN,aAAaO,OAAO,CAChBC,KAAMN,qBAAqBO,KAC3BC,gBAAiB,CACbC,KAAMb,EAAE,4BAA4B,EAAEc,IAAI,EAC1CC,QAASC,EAAEC,IAAIF,OACnB,EACAG,MAAO,IACX,CAAC,EACIC,KAAK,SAAUC,OACZA,MAAMC,KAAK,CACf,CAAC,CACT,CAAC,CACL,CACJ,CACJ,CAAC"}
\ No newline at end of file
diff --git a/amd/build/rubric.min.js b/amd/build/rubric.min.js
index 45aaeb30..8496e178 100644
--- a/amd/build/rubric.min.js
+++ b/amd/build/rubric.min.js
@@ -1,2 +1,2 @@
-define(["jquery","core/templates","core/modal","core/modal_events","plagiarism_turnitin/modal_rubric_manager_launch","plagiarism_turnitin/modal_rubric_view_launch"],function($,Templates,Modal,ModalEvents,ModalRubricManagerLaunch,ModalRubricViewLaunch){return{rubric:function(){var that=this;$(".rubric_manager_launch").on("click",function(){var courseid=$(this).data("courseid");var cmid=$(this).data("cmid");that.rubricCreateModal(ModalRubricManagerLaunch.TYPE,courseid,cmid)});$(document).on("click",".rubric_view",function(){var courseid=$(this).data("courseid");var cmid=$(this).data("cmid");that.rubricCreateModal(ModalRubricViewLaunch.TYPE,courseid,cmid)});$("#id_plagiarism_rubric").mousedown(function(){if($('input[name="instance"]').val()!=""&&$('input[name="rubric_warning_seen"]').val()!="Y"){if(confirm(M.str.plagiarism_turnitin.changerubricwarning)){$('input[name="rubric_warning_seen"]').val("Y")}}})},rubricCreateModal:function(modalType,courseid,cmid){Modal.create({type:modalType,templateContext:{courseid:courseid,cmid:cmid,wwwroot:M.cfg.wwwroot},large:true}).then(function(modal){modal.show();modal.getRoot().find(".modal").addClass("tii_pp_modal_rubric");modal.getRoot().find(".modal-content").addClass("tii_pp_modal_rubric_content")})}}});
+define("plagiarism_turnitin/rubric",["jquery","core/templates","core/modal_factory","core/modal_events","plagiarism_turnitin/modal_rubric_manager_launch","plagiarism_turnitin/modal_rubric_view_launch"],function($,Templates,ModalFactory,ModalEvents,ModalRubricManagerLaunch,ModalRubricViewLaunch){return{rubric:function(){var that=this;$(".rubric_manager_launch").on("click",function(){var courseid=$(this).data("courseid");var cmid=$(this).data("cmid");that.rubricCreateModal(ModalRubricManagerLaunch.TYPE,courseid,cmid)});$(document).on("click",".rubric_view",function(){var courseid=$(this).data("courseid");var cmid=$(this).data("cmid");that.rubricCreateModal(ModalRubricViewLaunch.TYPE,courseid,cmid)});$("#id_plagiarism_rubric").mousedown(function(){if($('input[name="instance"]').val()!=""&&$('input[name="rubric_warning_seen"]').val()!="Y"){if(confirm(M.str.plagiarism_turnitin.changerubricwarning)){$('input[name="rubric_warning_seen"]').val("Y")}}})},rubricCreateModal:function(modalType,courseid,cmid){ModalFactory.create({type:modalType,templateContext:{courseid:courseid,cmid:cmid,wwwroot:M.cfg.wwwroot},large:true}).then(function(modal){modal.show();modal.getRoot().find(".modal").addClass("tii_pp_modal_rubric");modal.getRoot().find(".modal-content").addClass("tii_pp_modal_rubric_content")})}}});
 //# sourceMappingURL=rubric.min.js.map
\ No newline at end of file
diff --git a/amd/build/rubric.min.js.map b/amd/build/rubric.min.js.map
index 96ca162f..375e6819 100644
--- a/amd/build/rubric.min.js.map
+++ b/amd/build/rubric.min.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../src/rubric.js"],"names":["define","$","Templates","Modal","ModalEvents","ModalRubricManagerLaunch","ModalRubricViewLaunch","rubric","that","this","on","courseid","data","cmid","rubricCreateModal","TYPE","document","mousedown","val","confirm","M","str","plagiarism_turnitin","changerubricwarning","modalType","create","type","templateContext","wwwroot","cfg","large","then","modal","show","getRoot","find","addClass"],"mappings":"AAQAA,OAAO,CAAC,SACA,iBACA,aACA,oBACA,kDACA,gDAEJ,SAASC,EAAGC,UAAWC,MAAOC,YAAaC,yBAA0BC,uBACjE,MAAO,CACHC,OAAQ,WACJ,IAAIC,KAAOC,KACXR,EAAE,wBAAwB,EAAES,GAAG,QAAS,WACpC,IAAIC,SAAWV,EAAEQ,IAAI,EAAEG,KAAK,UAAU,EACtC,IAAIC,KAAOZ,EAAEQ,IAAI,EAAEG,KAAK,MAAM,EAC9BJ,KAAKM,kBAAkBT,yBAAyBU,KAAMJ,SAAUE,IAAI,CACxE,CAAC,EAEDZ,EAAEe,QAAQ,EAAEN,GAAG,QAAS,eAAgB,WACpC,IAAIC,SAAWV,EAAEQ,IAAI,EAAEG,KAAK,UAAU,EACtC,IAAIC,KAAOZ,EAAEQ,IAAI,EAAEG,KAAK,MAAM,EAC9BJ,KAAKM,kBAAkBR,sBAAsBS,KAAMJ,SAAUE,IAAI,CACrE,CAAC,EAGDZ,EAAE,uBAAuB,EAAEgB,UAAU,WACjC,GAAIhB,EAAE,wBAAwB,EAAEiB,IAAI,GAAK,IAAMjB,EAAE,mCAAmC,EAAEiB,IAAI,GAAK,IAAK,CAChG,GAAIC,QAAQC,EAAEC,IAAIC,oBAAoBC,mBAAmB,EAAG,CACxDtB,EAAE,mCAAmC,EAAEiB,IAAI,GAAG,CAClD,CACJ,CACJ,CAAC,CACL,EACAJ,kBAAmB,SAASU,UAAWb,SAAUE,MAC7CV,MAAMsB,OAAO,CACTC,KAAMF,UACNG,gBAAiB,CACbhB,SAAUA,SACVE,KAAMA,KACNe,QAASR,EAAES,IAAID,OACnB,EACAE,MAAO,IACX,CAAC,EACIC,KAAK,SAAUC,OACZA,MAAMC,KAAK,EACXD,MAAME,QAAQ,EAAEC,KAAK,QAAQ,EAAEC,SAAS,qBAAqB,EAC7DJ,MAAME,QAAQ,EAAEC,KAAK,gBAAgB,EAAEC,SAAS,6BAA6B,CACjF,CAAC,CACT,CACJ,CACJ,CAAC"}
\ No newline at end of file
+{"version":3,"sources":["src/rubric.js"],"names":["define","$","Templates","ModalFactory","ModalEvents","ModalRubricManagerLaunch","ModalRubricViewLaunch","rubric","that","this","on","courseid","data","cmid","rubricCreateModal","TYPE","document","mousedown","val","confirm","M","str","plagiarism_turnitin","changerubricwarning","modalType","create","type","templateContext","wwwroot","cfg","large","then","modal","show","getRoot","find","addClass"],"mappings":"AAQAA,OAAO,CAAC,SACA,iBACA,qBACA,oBACA,kDACA,gDAEJ,SAASC,EAAGC,UAAWC,aAAcC,YAAaC,yBAA0BC,uBACxE,MAAO,CACHC,OAAQ,WACJ,IAAIC,KAAOC,KACXR,EAAE,wBAAwB,EAAES,GAAG,QAAS,WACpC,IAAIC,SAAWV,EAAEQ,IAAI,EAAEG,KAAK,UAAU,EACtC,IAAIC,KAAOZ,EAAEQ,IAAI,EAAEG,KAAK,MAAM,EAC9BJ,KAAKM,kBAAkBT,yBAAyBU,KAAMJ,SAAUE,IAAI,CACxE,CAAC,EAEDZ,EAAEe,QAAQ,EAAEN,GAAG,QAAS,eAAgB,WACpC,IAAIC,SAAWV,EAAEQ,IAAI,EAAEG,KAAK,UAAU,EACtC,IAAIC,KAAOZ,EAAEQ,IAAI,EAAEG,KAAK,MAAM,EAC9BJ,KAAKM,kBAAkBR,sBAAsBS,KAAMJ,SAAUE,IAAI,CACrE,CAAC,EAGDZ,EAAE,uBAAuB,EAAEgB,UAAU,WACjC,GAAIhB,EAAE,wBAAwB,EAAEiB,IAAI,GAAK,IAAMjB,EAAE,mCAAmC,EAAEiB,IAAI,GAAK,IAAK,CAChG,GAAIC,QAAQC,EAAEC,IAAIC,oBAAoBC,mBAAmB,EAAG,CACxDtB,EAAE,mCAAmC,EAAEiB,IAAI,GAAG,CAClD,CACJ,CACJ,CAAC,CACL,EACAJ,kBAAmB,SAASU,UAAWb,SAAUE,MAC7CV,aAAasB,OAAO,CAChBC,KAAMF,UACNG,gBAAiB,CACbhB,SAAUA,SACVE,KAAMA,KACNe,QAASR,EAAES,IAAID,OACnB,EACAE,MAAO,IACX,CAAC,EACIC,KAAK,SAAUC,OACZA,MAAMC,KAAK,EACXD,MAAME,QAAQ,EAAEC,KAAK,QAAQ,EAAEC,SAAS,qBAAqB,EAC7DJ,MAAME,QAAQ,EAAEC,KAAK,gBAAgB,EAAEC,SAAS,6BAA6B,CACjF,CAAC,CACT,CACJ,CACJ,CAAC"}
\ No newline at end of file
diff --git a/amd/src/modal_peermark_manager_launch.js b/amd/src/modal_peermark_manager_launch.js
index a1b1396a..6e945f85 100644
--- a/amd/src/modal_peermark_manager_launch.js
+++ b/amd/src/modal_peermark_manager_launch.js
@@ -34,6 +34,7 @@ define(
         };
 
         ModalPeermarkManagerLaunch.TYPE = 'plagiarism_turnitin-modal_peermark_manager_launch';
+        ModalPeermarkManagerLaunch.TEMPLATE = 'plagiarism_turnitin/modal_peermark_manager_launch';
         ModalPeermarkManagerLaunch.prototype = Object.create(Modal.prototype);
         ModalPeermarkManagerLaunch.prototype.constructor = ModalPeermarkManagerLaunch;
 
diff --git a/amd/src/modal_peermark_reviews_launch.js b/amd/src/modal_peermark_reviews_launch.js
index 644de13e..ea6b8c31 100644
--- a/amd/src/modal_peermark_reviews_launch.js
+++ b/amd/src/modal_peermark_reviews_launch.js
@@ -34,6 +34,7 @@ define(
         };
 
         ModalPeermarkReviewsLaunch.TYPE = 'plagiarism_turnitin-modal_peermark_reviews_launch';
+        ModalPeermarkReviewsLaunch.TEMPLATE = 'plagiarism_turnitin/modal_peermark_reviews_launch';
         ModalPeermarkReviewsLaunch.prototype = Object.create(Modal.prototype);
         ModalPeermarkReviewsLaunch.prototype.constructor = ModalPeermarkReviewsLaunch;
 
diff --git a/amd/src/modal_quickmark_launch.js b/amd/src/modal_quickmark_launch.js
index 7c54e6e4..ecd5af02 100644
--- a/amd/src/modal_quickmark_launch.js
+++ b/amd/src/modal_quickmark_launch.js
@@ -34,6 +34,7 @@ define(
         };
 
         ModalQuickmarkLaunch.TYPE = 'plagiarism_turnitin-modal_quickmark_launch';
+        ModalQuickmarkLaunch.TEMPLATE = 'plagiarism_turnitin/modal_quickmark_launch';
         ModalQuickmarkLaunch.prototype = Object.create(Modal.prototype);
         ModalQuickmarkLaunch.prototype.constructor = ModalQuickmarkLaunch;
 
diff --git a/amd/src/modal_rubric_manager_launch.js b/amd/src/modal_rubric_manager_launch.js
index 61d77a2c..2925e5a9 100644
--- a/amd/src/modal_rubric_manager_launch.js
+++ b/amd/src/modal_rubric_manager_launch.js
@@ -34,6 +34,7 @@ define(
         };
 
         ModalRubricManagerLaunch.TYPE = 'plagiarism_turnitin-modal_rubric_manager_launch';
+        ModalRubricManagerLaunch.TEMPLATE = 'plagiarism_turnitin/modal_rubric_manager_launch';
         ModalRubricManagerLaunch.prototype = Object.create(Modal.prototype);
         ModalRubricManagerLaunch.prototype.constructor = ModalRubricManagerLaunch;
 
diff --git a/amd/src/modal_rubric_view_launch.js b/amd/src/modal_rubric_view_launch.js
index e4c8e0e0..c5c8a1c1 100644
--- a/amd/src/modal_rubric_view_launch.js
+++ b/amd/src/modal_rubric_view_launch.js
@@ -34,6 +34,7 @@ define(
         };
 
         ModalRubricViewLaunch.TYPE = 'plagiarism_turnitin-modal_rubric_view_launch';
+        ModalRubricViewLaunch.TEMPLATE = 'plagiarism_turnitin/modal_rubric_view_launch';
         ModalRubricViewLaunch.prototype = Object.create(Modal.prototype);
         ModalRubricViewLaunch.prototype.constructor = ModalRubricViewLaunch;
 
diff --git a/amd/src/new_peermark.js b/amd/src/new_peermark.js
new file mode 100644
index 00000000..1613bf98
--- /dev/null
+++ b/amd/src/new_peermark.js
@@ -0,0 +1,51 @@
+/**
+ * Javascript controller for launching a Peermark modal.
+ *
+ * @copyright Turnitin
+ * @author 2024 Isaac Xiong <ixiong@turnitin.com>
+ * @module plagiarism_turnitin/newPeermarkLaunch
+ */
+
+define(['jquery',
+        'core/templates',
+        'core/modal',
+        'core/modal_events',
+        'plagiarism_turnitin/modal_peermark_manager_launch',
+        'plagiarism_turnitin/modal_peermark_reviews_launch'
+    ],
+    function($, Templates, Modal, ModalEvents, ModalPeermarkManagerLaunch, ModalPeermarkReviewsLaunch) {
+        return {
+            newPeermarkLaunch: function() {
+                var that = this;
+                $('.peermark_manager_launch').on('click', function(event) {
+                    event.preventDefault();
+                    that.peermarkModalCreate(ModalPeermarkManagerLaunch);
+                });
+
+                $(document).on('click', '.peermark_reviews_pp_launch', function() {
+                    that.peermarkModalCreate(ModalPeermarkReviewsLaunch);
+                });
+            },
+            peermarkModalCreate: function(modalType) {
+
+                if ($('input[name="coursemodule"]').val()) {
+                    var cmid = $('input[name="coursemodule"]').val();
+                } else {
+                    var urlParams = new URLSearchParams(window.location.search);
+                    var cmid = urlParams.get('id');
+                }
+                Modal.create({
+                    type: modalType.TYPE,
+                    template: modalType.TEMPLATE,
+                    templateContext: {
+                        cmid: cmid,
+                        wwwroot: M.cfg.wwwroot
+                    },
+                    large: true
+                })
+                    .then(function (modal) {
+                        modal.show();
+                    });
+            }
+        };
+    });
\ No newline at end of file
diff --git a/amd/src/new_quickmark.js b/amd/src/new_quickmark.js
new file mode 100644
index 00000000..045508ce
--- /dev/null
+++ b/amd/src/new_quickmark.js
@@ -0,0 +1,35 @@
+/**
+ * Javascript controller for launching a Quickmark modal.
+ *
+ * @copyright Turnitin
+ * @author 2024 Isaac Xiong <ixiong@turnitin.com>
+ * @module plagiarism_turnitin/newQuickmarkLaunch
+ */
+
+define(['jquery',
+        'core/templates',
+        'core/modal',
+        'core/modal_events',
+        'plagiarism_turnitin/modal_quickmark_launch',
+    ],
+    function($, Templates, Modal, ModalEvents, ModalQuickmarkLaunch) {
+        return {
+            newQuickmarkLaunch: function() {
+                $('.plagiarism_turnitin_quickmark_manager_launch').on('click', function (event) {
+                    event.preventDefault();
+                    Modal.create({
+                        type: ModalQuickmarkLaunch.TYPE,
+                        template: ModalQuickmarkLaunch.TEMPLATE,
+                        templateContext: {
+                            cmid: $('input[name="coursemodule"]').val(),
+                            wwwroot: M.cfg.wwwroot
+                        },
+                        large: true
+                    })
+                        .then(function (modal) {
+                            modal.show();
+                        });
+                });
+            }
+        };
+    });
\ No newline at end of file
diff --git a/amd/src/new_rubric.js b/amd/src/new_rubric.js
new file mode 100644
index 00000000..0a415948
--- /dev/null
+++ b/amd/src/new_rubric.js
@@ -0,0 +1,59 @@
+/**
+ * Javascript controller for handling rubrics.
+ *
+ * @copyright Turnitin
+ * @author 2024 Isaac Xiong <ixiong@turnitin.com>
+ * @module plagiarism_turnitin/newRubric
+ */
+
+define(['jquery',
+        'core/templates',
+        'core/modal',
+        'core/modal_events',
+        'plagiarism_turnitin/modal_rubric_manager_launch',
+        'plagiarism_turnitin/modal_rubric_view_launch'
+    ],
+    function($, Templates, Modal, ModalEvents, ModalRubricManagerLaunch, ModalRubricViewLaunch) {
+        return {
+            newRubric: function() {
+                var that = this;
+                $('.rubric_manager_launch').on('click', function() {
+                    var courseid = $(this).data('courseid');
+                    var cmid = $(this).data('cmid');
+                    that.rubricCreateModal(ModalRubricManagerLaunch, courseid, cmid);
+                });
+
+                $(document).on('click', '.rubric_view', function() {
+                    var courseid = $(this).data('courseid');
+                    var cmid = $(this).data('cmid');
+                    that.rubricCreateModal(ModalRubricViewLaunch, courseid, cmid);
+                });
+
+                // Show warning when changing the rubric linked to an assignment.
+                $('#id_plagiarism_rubric').mousedown(function () {
+                    if ($('input[name="instance"]').val() != '' && $('input[name="rubric_warning_seen"]').val() != 'Y') {
+                        if (confirm(M.str.plagiarism_turnitin.changerubricwarning)) {
+                            $('input[name="rubric_warning_seen"]').val('Y');
+                        }
+                    }
+                });
+            },
+            rubricCreateModal: function(modalType, courseid, cmid) {
+                Modal.create({
+                    type: modalType.TYPE,
+                    template: modalType.TEMPLATE,
+                    templateContext: {
+                        courseid: courseid,
+                        cmid: cmid,
+                        wwwroot: M.cfg.wwwroot
+                    },
+                    large: true
+                })
+                    .then(function (modal) {
+                        modal.show();
+                        modal.getRoot().find('.modal').addClass('tii_pp_modal_rubric');
+                        modal.getRoot().find('.modal-content').addClass('tii_pp_modal_rubric_content');
+                    });
+            }
+        };
+    });
diff --git a/amd/src/peermark.js b/amd/src/peermark.js
index 8455fd6a..7b64a907 100644
--- a/amd/src/peermark.js
+++ b/amd/src/peermark.js
@@ -8,22 +8,22 @@
 
 define(['jquery',
         'core/templates',
-        'core/modal',
+        'core/modal_factory',
         'core/modal_events',
         'plagiarism_turnitin/modal_peermark_manager_launch',
         'plagiarism_turnitin/modal_peermark_reviews_launch'
     ],
-    function($, Templates, Modal, ModalEvents, ModalPeermarkManagerLaunch, ModalPeermarkReviewsLaunch) {
+    function($, Templates, ModalFactory, ModalEvents, ModalPeermarkManagerLaunch, ModalPeermarkReviewsLaunch) {
         return {
             peermarkLaunch: function() {
                 var that = this;
                 $('.peermark_manager_launch').on('click', function(event) {
                     event.preventDefault();
-                    that.peermarkCreateModal(ModalPeermarkManagerLaunch.TYPE);
+                    that.peermarkCreateModal(ModalPeermarkManagerLaunch);
                 });
 
                 $(document).on('click', '.peermark_reviews_pp_launch', function() {
-                    that.peermarkCreateModal(ModalPeermarkReviewsLaunch.TYPE);
+                    that.peermarkCreateModal(ModalPeermarkReviewsLaunch);
                 });
             },
             peermarkCreateModal: function(modalType) {
@@ -34,8 +34,8 @@ define(['jquery',
                     var urlParams = new URLSearchParams(window.location.search);
                     var cmid = urlParams.get('id');
                 }
-                Modal.create({
-                    type: modalType,
+                ModalFactory.create({
+                    type: modalType.TYPE,
                     templateContext: {
                         cmid: cmid,
                         wwwroot: M.cfg.wwwroot
diff --git a/amd/src/quickmark.js b/amd/src/quickmark.js
index 720c0cd4..5a3a94ba 100644
--- a/amd/src/quickmark.js
+++ b/amd/src/quickmark.js
@@ -8,16 +8,16 @@
 
 define(['jquery',
         'core/templates',
-        'core/modal',
+        'core/modal_factory',
         'core/modal_events',
         'plagiarism_turnitin/modal_quickmark_launch'
     ],
-    function($, Templates, Modal, ModalEvents, ModalQuickmarkLaunch) {
+    function($, Templates, ModalFactory, ModalEvents, ModalQuickmarkLaunch) {
         return {
             quickmarkLaunch: function() {
                 $('.plagiarism_turnitin_quickmark_manager_launch').on('click', function (event) {
                     event.preventDefault();
-                    Modal.create({
+                    ModalFactory.create({
                         type: ModalQuickmarkLaunch.TYPE,
                         templateContext: {
                             cmid: $('input[name="coursemodule"]').val(),
diff --git a/amd/src/rubric.js b/amd/src/rubric.js
index 79a3dbb8..a4ab429c 100644
--- a/amd/src/rubric.js
+++ b/amd/src/rubric.js
@@ -8,12 +8,12 @@
 
 define(['jquery',
         'core/templates',
-        'core/modal',
+        'core/modal_factory',
         'core/modal_events',
         'plagiarism_turnitin/modal_rubric_manager_launch',
         'plagiarism_turnitin/modal_rubric_view_launch'
     ],
-    function($, Templates, Modal, ModalEvents, ModalRubricManagerLaunch, ModalRubricViewLaunch) {
+    function($, Templates, ModalFactory, ModalEvents, ModalRubricManagerLaunch, ModalRubricViewLaunch) {
         return {
             rubric: function() {
                 var that = this;
@@ -39,7 +39,7 @@ define(['jquery',
                 });
             },
             rubricCreateModal: function(modalType, courseid, cmid) {
-                Modal.create({
+                ModalFactory.create({
                     type: modalType,
                     templateContext: {
                         courseid: courseid,
diff --git a/classes/turnitin_view.class.php b/classes/turnitin_view.class.php
index adf2e48c..07d304a9 100644
--- a/classes/turnitin_view.class.php
+++ b/classes/turnitin_view.class.php
@@ -83,7 +83,7 @@ public function draw_settings_tab_menu($currenttab, $notice = null) {
      * @return type
      */
     public function add_elements_to_settings_form($mform, $course, $location = "activity", $modulename = "", $cmid = 0, $currentrubric = 0) {
-        global $PAGE, $USER, $DB;
+        global $PAGE, $USER, $DB, $CFG;
 
         // Include JS strings
         $PAGE->requires->string_for_js('changerubricwarning', 'plagiarism_turnitin');
@@ -137,11 +137,16 @@ public function add_elements_to_settings_form($mform, $course, $location = "acti
 
             // Add in custom Javascript and CSS.
             $PAGE->requires->jquery_plugin('ui');
-            $PAGE->requires->js_call_amd('plagiarism_turnitin/peermark', 'peermarkLaunch');
-            $PAGE->requires->js_call_amd('plagiarism_turnitin/quickmark', 'quickmarkLaunch');
-            $PAGE->requires->js_call_amd('plagiarism_turnitin/rubric', 'rubric');
             $PAGE->requires->js_call_amd('plagiarism_turnitin/refresh_submissions', 'refreshSubmissions');
-
+            if ($CFG->version >= 2023100900) {
+                $PAGE->requires->js_call_amd('plagiarism_turnitin/newPeermarkLaunch', 'newPeermarkLaunch');
+                $PAGE->requires->js_call_amd('plagiarism_turnitin/newQuickmarkLaunch', 'newQuickmarkLaunch');
+                $PAGE->requires->js_call_amd('plagiarism_turnitin/newRubric', 'newRubric');
+            } else {
+                $PAGE->requires->js_call_amd('plagiarism_turnitin/peermarkLaunch', 'peermarkLaunch');
+                $PAGE->requires->js_call_amd('plagiarism_turnitin/quickmarkLaunch', 'quickmarkLaunch');
+                $PAGE->requires->js_call_amd('plagiarism_turnitin/rubric', 'rubric');
+            }
             // Refresh Grades.
             $refreshgrades = '';
             if ($cmid != 0) {
diff --git a/lib.php b/lib.php
index 05463278..dccfdee5 100755
--- a/lib.php
+++ b/lib.php
@@ -574,18 +574,20 @@ public function load_page_components() {
         if (static::$amdcomponentsloaded) {
             return;
         }
+
         $PAGE->requires->js_call_amd('plagiarism_turnitin/open_viewer', 'origreport_open');
         $PAGE->requires->js_call_amd('plagiarism_turnitin/open_viewer', 'grademark_open');
-
-        $PAGE->requires->js_call_amd('plagiarism_turnitin/peermark', 'peermarkLaunch');
-        $PAGE->requires->js_call_amd('plagiarism_turnitin/rubric', 'rubric');
-
         // Moodle 4.3 uses a new Modal dialog that is not compatible with older versions of Moodle. Depending on the user's
         // version of Moodle, we will use the supported versin of Modal dialog
         if ($CFG->version >= 2023100900) {
             $PAGE->requires->js_call_amd('plagiarism_turnitin/newEulaLaunch', 'newEulaLaunch');
+            $PAGE->requires->js_call_amd('plagiarism_turnitin/newPeermarkLaunch', 'newPeermarkLaunch');
+            $PAGE->requires->js_call_amd('plagiarism_turnitin/newRubric', 'newRubric');
+
         } else {
             $PAGE->requires->js_call_amd('plagiarism_turnitin/eulaLaunch', 'eulaLaunch');
+            $PAGE->requires->js_call_amd('plagiarism_turnitin/peermarkLaunch', 'peermarkLaunch');
+            $PAGE->requires->js_call_amd('plagiarism_turnitin/rubric', 'rubric');
         }
 
         $PAGE->requires->js_call_amd('plagiarism_turnitin/resend_submission', 'resendSubmission');
diff --git a/version.php b/version.php
index 2137ac2d..72591cfe 100644
--- a/version.php
+++ b/version.php
@@ -19,7 +19,7 @@
  * @copyright 2012 iParadigms LLC
  */
 
-$plugin->version = 2023121901;
+$plugin->version = 2024020501;
 
 $plugin->release = "3.5+";
 $plugin->requires = 2018051700;