diff --git a/classes/external.php b/classes/external.php
index e182052..a8a4ddf 100644
--- a/classes/external.php
+++ b/classes/external.php
@@ -18,7 +18,7 @@
  * External
  *
  * @package    qtype_aitext
- * @author     Justin Hunt - poodll.com
+ * @copyright  Justin Hunt - poodll.com
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 defined('MOODLE_INTERNAL') || die();
diff --git a/db/install.xml b/db/install.xml
index d25b862..9b43000 100755
--- a/db/install.xml
+++ b/db/install.xml
@@ -20,7 +20,8 @@
         <FIELD NAME="aiprompt" TYPE="text" NOTNULL="false" SEQUENCE="false" COMMENT="The prompt to be sent to the LLM for getting an answer/feedback"/>
         <FIELD NAME="markscheme" TYPE="text" NOTNULL="false" SEQUENCE="false" COMMENT="Instructions on how responses are to be marked."/>
         <FIELD NAME="sampleanswer" TYPE="text" NOTNULL="false" SEQUENCE="false" COMMENT="A sample answer for testing the prompt and AI response"/>
-      </FIELDS>
+        <FIELD NAME="model" TYPE="char" LENGTH="60" NOTNULL="false" SEQUENCE="false" COMMENT="The model in the LLM, e.g. gpt-4 or llama3"/>
+</FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id"/>
         <KEY NAME="questionid" TYPE="foreign-unique" FIELDS="questionid" REFTABLE="question" REFFIELDS="id"/>
diff --git a/db/upgrade.php b/db/upgrade.php
index 0d53c44..6468b74 100644
--- a/db/upgrade.php
+++ b/db/upgrade.php
@@ -18,6 +18,7 @@
  * AI Text question type upgrade code.
  *
  * @package    qtype_aitext
+ * @copyright  Marcus Green 2024
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
@@ -46,5 +47,20 @@ function xmldb_qtype_aitext_upgrade($oldversion) {
 
     }
 
+    if ($oldversion < 2024051100) {
+
+        // Define field model to be added to qtype_aitext.
+        $table = new xmldb_table('qtype_aitext');
+        $field = new xmldb_field('model', XMLDB_TYPE_CHAR, '60', null, null, null, null, 'sampleanswer');
+
+        // Conditionally launch add field model.
+        if (!$dbman->field_exists($table, $field)) {
+            $dbman->add_field($table, $field);
+        }
+
+        // Aitext savepoint reached.
+        upgrade_plugin_savepoint(true, 2024051100, 'qtype', 'aitext');
+    }
+
     return true;
 }
diff --git a/edit_aitext_form.php b/edit_aitext_form.php
index 089f0dc..869ea17 100755
--- a/edit_aitext_form.php
+++ b/edit_aitext_form.php
@@ -57,7 +57,16 @@ protected function definition_inner($mform) {
         $mform->setType('markscheme', PARAM_RAW);
         $mform->setDefault('markscheme', get_config('qtype_aitext', 'defaultmarksscheme'));
         $mform->addHelpButton('markscheme', 'markscheme', 'qtype_aitext');
+        $models = explode(",", get_config('tool_aiconnect', 'model'));
+        if (count($models) > 1 ) {
+            $models = array_combine($models, $models);
+            $mform->addElement('select', 'model', 'Models', $models);
 
+        } else {
+            $mform->addElement('hidden', 'model', $models[0]);
+        }
+        $mform->setType('model', PARAM_RAW);
+        // The question_edit_form that this class extends expects a general feedback field.
         $mform->addElement('html', '<div class="hidden">');
         $mform->addElement('editor', 'generalfeedback', get_string('generalfeedback', 'question')
         , ['rows' => 10], $this->editoroptions);
@@ -72,7 +81,6 @@ protected function definition_inner($mform) {
                 id="id_sampleanswerbtn">'
             . get_string('sampleanswerevaluate', 'qtype_aitext') . '</a>' .
              '<div class="qtype_aitext_sampleanswereval" id="id_sampleanswereval"></div>');
-
         $mform->addElement('header', 'responseoptions', get_string('responseoptions', 'qtype_aitext'));
         $mform->setExpanded('responseoptions');
 
diff --git a/question.php b/question.php
index e47e474..8fb8a06 100755
--- a/question.php
+++ b/question.php
@@ -55,6 +55,12 @@ class qtype_aitext_question extends question_graded_automatically_with_countback
     /** @var int indicates whether the maximum number of words required */
     public $maxwordlimit;
 
+    /**
+     * LLM Model, will vary between AI systems, e.g. gpt4 or llama3
+     * @var stream_set_blocking
+     */
+    public $model;
+
 
     /**
      * used in the question editing interface
@@ -146,7 +152,7 @@ public function grade_response(array $response) : array {
             $grade = [0 => 0, question_state::$needsgrading];
             return $grade;
         }
-        $ai = new ai\ai();
+        $ai = new ai\ai($this->model);
         if (is_array($response)) {
             $fullaiprompt = $this->build_full_ai_prompt($response['answer'], $this->aiprompt,
                  $this->defaultmark, $this->markscheme);
@@ -173,8 +179,16 @@ public function grade_response(array $response) : array {
         return $grade;
     }
 
+    /**
+     * Used by prompttester in the editing form
+     *
+     * @param string $response
+     * @param string $aiprompt
+     * @param number $defaultmark
+     * @param string $markscheme
+     * @return void
+     */
     public function build_full_ai_prompt($response, $aiprompt, $defaultmark, $markscheme) {
-
         $responsetext = strip_tags($response);
             $responsetext = '[['.$responsetext.']]';
             $prompt = get_config('qtype_aitext', 'prompt');
diff --git a/questiontype.php b/questiontype.php
index d8d3b1f..3d69d3e 100755
--- a/questiontype.php
+++ b/questiontype.php
@@ -78,6 +78,9 @@ public function save_defaults_for_new_questions(stdClass $fromform): void {
         $this->set_default_value('responseformat', $fromform->responseformat);
         $this->set_default_value('responsefieldlines', $fromform->responsefieldlines);
         $this->set_default_value('markscheme', $fromform->markscheme);
+        $this->set_default_value('model', $fromform->model);
+        $this->set_default_value('sampleanswer', $fromform->sampleanswer);
+
     }
     /**
      * Write the question data from the editing form to the database
@@ -97,6 +100,7 @@ public function save_question_options($formdata) {
         $options->aiprompt = $formdata->aiprompt;
         $options->markscheme = $formdata->markscheme;
         $options->sampleanswer = $formdata->sampleanswer;
+        $options->model = trim($formdata->model);
         $options->responseformat = $formdata->responseformat;
         $options->responsefieldlines = $formdata->responsefieldlines;
         $options->minwordlimit = isset($formdata->minwordenabled) ? $formdata->minwordlimit : null;
@@ -144,6 +148,7 @@ protected function initialise_question_instance(question_definition $question, $
         $question->aiprompt = $questiondata->options->aiprompt;
         $question->markscheme = $questiondata->options->markscheme;
         $question->sampleanswer = $questiondata->options->sampleanswer;
+        $question->model = $questiondata->options->model;
     }
     /**
      * Delete a question from the database
@@ -249,7 +254,8 @@ public function extra_question_fields() {
             'responsetemplateformat',
             'aiprompt',
             'markscheme',
-            'sampleanswer'
+            'sampleanswer',
+            'model',
         ];
     }
     /**
diff --git a/renderer.php b/renderer.php
index 427f073..dbcaaf8 100755
--- a/renderer.php
+++ b/renderer.php
@@ -123,6 +123,7 @@ public function feedback(question_attempt $qa, question_display_options $options
         // Get data written in the question.php grade_response method.
         // This probably should be retrieved by an api call.
         $comment = $qa->get_current_manual_comment();
+        xdebug_break();
         if ($this->page->pagetype == 'question-bank-previewquestion-preview') {
             $this->page->requires->js_call_amd('qtype_aitext/showprompt', 'init', []);
             if ($comment[0] > '') {
diff --git a/version.php b/version.php
index 70e91e2..a3cfc97 100755
--- a/version.php
+++ b/version.php
@@ -25,7 +25,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'qtype_aitext';
-$plugin->version   = 2024050300;
+$plugin->version   = 2024051100;
 $plugin->requires  = 2020110900;
 $plugin->release = '0.01';
 $plugin->maturity  = MATURITY_BETA;