diff --git a/rplugin/python3/CodeExplain.py b/rplugin/python3/CodeExplain.py
index 5c53cd8..3de51a0 100644
--- a/rplugin/python3/CodeExplain.py
+++ b/rplugin/python3/CodeExplain.py
@@ -12,19 +12,35 @@ def __init__(self,):
         LLAMA_EMBEDDINGS_MODEL = str(Path.home()) +'/.codeexplain/model.bin' 
         MODEL_N_CTX = 1000
         CALLBACKS = [StreamingStdOutCallbackHandler()]
-        PROMPT_TEMPLATE = """This is a piece of code written in {language}. Provide a simple walkthrough of its operation and highlight any sections of the code that could potentially lead to security risks or inefficiencies. If you don't find any security risk or inefficiencies just don't mention it.
+        LLM = LlamaCpp(model_path=LLAMA_EMBEDDINGS_MODEL, n_ctx=MODEL_N_CTX, verbose=False)
+
+        CODE_EXPLAIN_PROMPT_TEMPLATE = """This is a piece of code written in {language}. Provide a simple walkthrough of its operation and highlight any sections of the code that could potentially lead to security risks or inefficiencies. If you don't find any security risk or inefficiencies just don't mention it.
         ```
         {code}
         ```
         answer:
         """
+        CODE_EXPLAIN_PROMPT = PromptTemplate(template=CODE_EXPLAIN_PROMPT_TEMPLATE, input_variables=["language","code"])
+        self.CODE_EXPLAIN_CHAIN = LLMChain(llm=LLM, prompt=CODE_EXPLAIN_PROMPT)
 
-        PROMPT = PromptTemplate(template=PROMPT_TEMPLATE, input_variables=["language","code"])
-        LLM = LlamaCpp(model_path=LLAMA_EMBEDDINGS_MODEL, n_ctx=MODEL_N_CTX, verbose=False)
-        self.CHAIN = LLMChain(llm=LLM, prompt=PROMPT)
+        CODE_GENERATOR_PROMPT_TEMPLATE = """
+        {request}
+
+        Your answer needs to contain only the code, don't add text formatting.
+        You are restricted to only write consitent and optmized code.
+
+        answer:
+        """
+        CODE_GENERATOR_PROMPT = PromptTemplate(template=CODE_GENERATOR_PROMPT_TEMPLATE, input_variables=["request"])
+        self.CODE_GENERATOR_CHAIN = LLMChain(llm=LLM, prompt=CODE_GENERATOR_PROMPT)
+
+    def codeExplain(self, input):
+        explained = self.CODE_EXPLAIN_CHAIN.run(input)
+        lines = explained.split('\n')
+        return lines
 
-    def run(self, input):
-        explained = self.CHAIN.run(input)
+    def codeGenerator(self, input):
+        explained = self.CODE_GENERATOR_CHAIN.run(input)
         lines = explained.split('\n')
         return lines
 
@@ -39,32 +55,41 @@ def getSelectedText(self,):
         begin = self.nvim.eval("line(\"'<\")")
         end = self.nvim.eval("line(\"'>\")")
         lines = self.nvim.current.buffer[begin - 1:end]
-        return '\n'.join(lines)
+        return (begin,end,'\n'.join(lines))
 
     def getProgrammingLanguage(self):
         file_name = self.nvim.current.buffer.name
         file_content = '\n'.join(self.nvim.current.buffer[:])
         try:
             lexer = guess_lexer_for_filename(file_name, file_content)
+            return lexer.name
         except ClassNotFound:
             lexer = TextLexer()
-        return lexer.name
+            return "programming"
 
     def createWindowBuffer(self,lines):
         bufnr = self.nvim.api.create_buf(False, True)
         winnr = self.nvim.api.open_win(bufnr, True, {
-            'relative': 'editor',
+            'relative': 'cursor',
             'width': 80,
             'height': 10,
-            'row': 10,
-            'col': 10
+            'row': 0,
+            'col': 0
         })
         self.nvim.api.buf_set_lines(bufnr, 0, -1, True, lines)
 
+    @pynvim.command('CodeGenerator', nargs='*',range=True, sync=True)
+    def codeGenerator(self,args,range):
+        begin,end,selected_text = self.getSelectedText()
+        generatedCode = self.codeExplainAI.codeGenerator({"request":selected_text})
+        lines = [self.nvim.funcs.escape(line, '\"\\') for line in generatedCode]
+        begin = self.nvim.eval("line(\"'<\")")
+        self.nvim.current.buffer[begin - 1:end] = generatedCode
+
     @pynvim.command('CodeExplain', nargs='*',range=True, sync=True)
     def codeExplain(self,args,range):
-        selected_text = self.getSelectedText()
-        programming_language = self.getProgrammingLanguage() or "programming"
-        explained = self.codeExplainAI.run({"language": programming_language,"code":selected_text})
+        _,_,selected_text = self.getSelectedText()
+        programming_language = self.getProgrammingLanguage()
+        explained = self.codeExplainAI.codeExplain({"language": programming_language,"code":selected_text})
         lines = [self.nvim.funcs.escape(line, '\"\\') for line in explained]
         self.createWindowBuffer(explained)