diff --git a/src/backends/maxima/maximasession.cpp b/src/backends/maxima/maximasession.cpp
index d739ecd4..190e2c69 100644
--- a/src/backends/maxima/maximasession.cpp
+++ b/src/backends/maxima/maximasession.cpp
@@ -1,345 +1,348 @@
 /*
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
     as published by the Free Software Foundation; either version 2
     of the License, or (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA  02110-1301, USA.
 
     ---
     Copyright (C) 2009-2012 Alexander Rieder <alexanderrieder@gmail.com>
     Copyright (C) 2017-2018 Alexander Semke (alexander.semke@web.de)
  */
 
 #include "maximasession.h"
 #include "maximaexpression.h"
 #include "maximacompletionobject.h"
 #include "maximasyntaxhelpobject.h"
 #include "maximahighlighter.h"
 #include "maximavariablemodel.h"
 #include "result.h"
 #include "settings.h"
 
 #include <QDebug>
 #include <QProcess>
 #include <QTimer>
 
 #include <KMessageBox>
 #include <KLocalizedString>
 
 #ifndef Q_OS_WIN
 #include <signal.h>
 #endif
 
 
 //NOTE: the \\s in the expressions is needed, because Maxima seems to sometimes insert newlines/spaces between the letters
 //maybe this is caused by some behaviour if the Prompt is split into multiple "readStdout" calls
 //the Expressions are encapsulated in () to allow capturing for the text
 const QRegExp MaximaSession::MaximaOutputPrompt=QRegExp(QLatin1String("(\\(\\s*%\\s*o\\s*[0-9\\s]*\\))")); //Text, maxima outputs, before any output
 const QRegExp MaximaSession::MaximaInputPrompt = QRegExp(QLatin1String("(\\(\\s*%\\s*i\\s*[0-9\\s]*\\))"));
 
 
 MaximaSession::MaximaSession( Cantor::Backend* backend ) : Session(backend),
     m_process(nullptr),
     m_variableModel(new MaximaVariableModel(this)),
-    m_justRestarted(false)
+    m_justRestarted(false),
+    m_needUpdate(false)
 {
 }
 
 void MaximaSession::login()
 {
     qDebug()<<"login";
 
     if (m_process)
         return; //TODO: why do we call login() again?!?
 
     emit loginStarted();
     QStringList arguments;
     arguments << QLatin1String("--quiet"); //Suppress Maxima start-up message
     const QString initFile = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("cantor/maximabackend/cantor-initmaxima.lisp"));
     arguments << QLatin1String("--init-lisp=") + initFile; //Set the name of the Lisp initialization file
 
     m_process = new QProcess(this);
     m_process->start(MaximaSettings::self()->path().toLocalFile(), arguments);
     m_process->waitForStarted();
 
     QString input;
     // Wait until first maxima prompt
     while (!input.contains(QLatin1String("</cantor-prompt>")))
     {
         m_process->waitForReadyRead();
         input += QString::fromLatin1(m_process->readAllStandardOutput());
         qDebug() << input;
     }
 
     connect(m_process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(restartMaxima()));
     connect(m_process, SIGNAL(readyReadStandardOutput()), this, SLOT(readStdOut()));
     connect(m_process, SIGNAL(readyReadStandardError()), this, SLOT(readStdErr()));
     connect(m_process, SIGNAL(error(QProcess::ProcessError)), this, SLOT(reportProcessError(QProcess::ProcessError)));
 
     if(!MaximaSettings::self()->autorunScripts().isEmpty()){
         QString autorunScripts = MaximaSettings::self()->autorunScripts().join(QLatin1String(";"));
         autorunScripts.append(QLatin1String(";kill(labels)")); // Reset labels after running autorun scripts
         evaluateExpression(autorunScripts, MaximaExpression::DeleteOnFinish, true);
+        m_needUpdate = true;
     }
 
     changeStatus(Session::Done);
     emit loginDone();
     qDebug()<<"login done";
 }
 
 void MaximaSession::logout()
 {
     qDebug()<<"logout";
 
     if(!m_process)
         return;
 
     disconnect(m_process, nullptr, this, nullptr);
 
 //     if(status()==Cantor::Session::Running)
         //TODO: terminate the running expressions first
 
     write(QLatin1String("quit();\n"));
     qDebug()<<"waiting for maxima to finish";
     m_process->waitForFinished();
     qDebug()<<"maxima exit finished";
 
     if(m_process->state() != QProcess::NotRunning)
     {
         m_process->kill();
         qDebug()<<"maxima still running, process kill enforced";
     }
 
     expressionQueue().clear();
     delete m_process;
     m_process = nullptr;
-    m_variableModel->clear();
+    m_variableModel->clearVariables();
+    m_variableModel->clearFunctions();
 
     changeStatus(Status::Disable);
 
     qDebug()<<"logout done";
 }
 
 Cantor::Expression* MaximaSession::evaluateExpression(const QString& cmd, Cantor::Expression::FinishingBehavior behave, bool internal)
 {
     qDebug() << "evaluating: " << cmd;
     MaximaExpression* expr = new MaximaExpression(this, internal);
     expr->setFinishingBehavior(behave);
     expr->setCommand(cmd);
     expr->evaluate();
 
     return expr;
 }
 
 void MaximaSession::readStdErr()
 {
    qDebug()<<"reading stdErr";
    if (!m_process)
        return;
    QString out=QLatin1String(m_process->readAllStandardError());
 
    if(expressionQueue().size()>0)
    {
        MaximaExpression* expr = static_cast<MaximaExpression*>(expressionQueue().first());
        expr->parseError(out);
    }
 }
 
 void MaximaSession::readStdOut()
 {
     QString out = QLatin1String(m_process->readAllStandardOutput());
     m_cache += out;
 
     //collect the multi-line output until Maxima has finished the calculation and returns a new promt
     if ( !out.contains(QLatin1String("</cantor-prompt>")) )
         return;
 
     if(expressionQueue().isEmpty())
     {
         //queue is empty, interrupt was called, nothing to do here
         qDebug()<<m_cache;
         m_cache.clear();
         return;
     }
 
     MaximaExpression* expr = static_cast<MaximaExpression*>(expressionQueue().first());
     if (!expr)
         return; //should never happen
 
     qDebug()<<"output: " << m_cache;
     expr->parseOutput(m_cache);
     m_cache.clear();
 }
 
 void MaximaSession::reportProcessError(QProcess::ProcessError e)
 {
     qDebug()<<"process error"<<e;
     if(e==QProcess::FailedToStart)
     {
         changeStatus(Cantor::Session::Done);
         emit error(i18n("Failed to start Maxima"));
     }
 }
 
 void MaximaSession::currentExpressionChangedStatus(Cantor::Expression::Status status)
 {
     Cantor::Expression* expression = expressionQueue().first();
     const QString& cmd = expression->command();
-    bool isInternal = expression->isInternal();
+    m_needUpdate |= !expression->isInternal();
     qDebug() << "expression status changed: command = " << expression->command() << ", status = " << status;
 
     if(status!=Cantor::Expression::Computing) //The session is ready for the next command
     {
         qDebug()<<"################################## EXPRESSION END ###############################################";
         disconnect(expression, SIGNAL(statusChanged(Cantor::Expression::Status)),
                    this, SLOT(currentExpressionChangedStatus(Cantor::Expression::Status)));
 
         expressionQueue().removeFirst();
         if(expressionQueue().isEmpty())
         {
-            //if we are done with all the commands in the queue,
-            //use the opportunity to update the variablemodel (if the last command wasn't already an update, as infinite loops aren't fun)
-
-            if(!isInternal || !m_variableModel->isUpdateCommand(cmd))
+            if(m_needUpdate)
+            {
                 m_variableModel->update();
+                m_needUpdate = false;
+            }
             else
                 changeStatus(Cantor::Session::Done);
         }else
         {
             runFirstExpression();
         }
     }
 }
 
 void MaximaSession::runFirstExpression()
 {
     qDebug()<<"running next expression";
     if (!m_process)
         return;
 
     if(!expressionQueue().isEmpty())
     {
         MaximaExpression* expr = static_cast<MaximaExpression*>(expressionQueue().first());
         QString command=expr->internalCommand();
         connect(expr, SIGNAL(statusChanged(Cantor::Expression::Status)), this, SLOT(currentExpressionChangedStatus(Cantor::Expression::Status)));
 
         expr->setStatus(Cantor::Expression::Computing);
         if(command.isEmpty())
         {
             qDebug()<<"empty command";
             expr->forceDone();
         }
         else
         {
             m_cache.clear();
             write(command + QLatin1Char('\n'));
         }
     }
 }
 
 void MaximaSession::interrupt()
 {
     if(!expressionQueue().isEmpty())
     {
         qDebug()<<"interrupting " << expressionQueue().first()->command();
         if(m_process->state() != QProcess::NotRunning)
         {
 #ifndef Q_OS_WIN
             const int pid=m_process->pid();
             kill(pid, SIGINT);
 #else
             ; //TODO: interrupt the process on windows
 #endif
         }
         expressionQueue().first()->interrupt();
         expressionQueue().removeFirst();
         foreach (Cantor::Expression* expression, expressionQueue())
             expression->setStatus(Cantor::Expression::Done);
         expressionQueue().clear();
 
         qDebug()<<"done interrupting";
     }
 
     changeStatus(Cantor::Session::Done);
     m_cache.clear();
 }
 
 void MaximaSession::sendInputToProcess(const QString& input)
 {
     write(input);
 }
 
 void MaximaSession::restartMaxima()
 {
     qDebug()<<"restarting maxima cooldown: "<<m_justRestarted;
 
     if(!m_justRestarted)
     {
         emit error(i18n("Maxima crashed. restarting..."));
         //remove the command that caused maxima to crash (to avoid infinite loops)
         if(!expressionQueue().isEmpty())
             expressionQueue().removeFirst();
 
         m_justRestarted=true;
         QTimer::singleShot(1000, this, SLOT(restartsCooledDown()));
 
         disconnect(m_process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(restartMaxima()));
         login();
     }else
     {
         if(!expressionQueue().isEmpty())
             expressionQueue().removeFirst();
         KMessageBox::error(nullptr, i18n("Maxima crashed twice within a short time. Stopping to try starting"), i18n("Error - Cantor"));
     }
 }
 
 void MaximaSession::restartsCooledDown()
 {
     qDebug()<<"maxima restart cooldown";
     m_justRestarted=false;
 }
 
 void MaximaSession::setTypesettingEnabled(bool enable)
 {
     //we use the lisp command to set the variable, as those commands
     //don't mess with the labels and history
     const QString& val=QLatin1String((enable==true ? "t":"nil"));
     evaluateExpression(QString::fromLatin1(":lisp(setf $display2d %1)").arg(val), Cantor::Expression::DeleteOnFinish, true);
 
     Cantor::Session::setTypesettingEnabled(enable);
 }
 
 Cantor::CompletionObject* MaximaSession::completionFor(const QString& command, int index)
 {
     return new MaximaCompletionObject(command, index, this);
 }
 
 Cantor::SyntaxHelpObject* MaximaSession::syntaxHelpFor(const QString& command)
 {
     return new MaximaSyntaxHelpObject(command, this);
 }
 
 QSyntaxHighlighter* MaximaSession::syntaxHighlighter(QObject* parent)
 {
     return new MaximaHighlighter(parent, this);
 }
 
 QAbstractItemModel* MaximaSession::variableModel()
 {
     return m_variableModel;
 }
 
 void MaximaSession::write(const QString& exp) {
     qDebug()<<"################################## EXPRESSION START ###############################################";
     qDebug()<<"sending expression to maxima process: " << exp;
     m_process->write(exp.toUtf8());
 }
diff --git a/src/backends/maxima/maximasession.h b/src/backends/maxima/maximasession.h
index 612f6fae..9533d8f7 100644
--- a/src/backends/maxima/maximasession.h
+++ b/src/backends/maxima/maximasession.h
@@ -1,75 +1,76 @@
 /*
     Tims program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
     as published by the Free Software Foundation; either version 2
     of the License, or (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA  02110-1301, USA.
 
     ---
     Copyright (C) 2009-2012 Alexander Rieder <alexanderrieder@gmail.com>
  */
 
 #ifndef _MAXIMASESSION_H
 #define _MAXIMASESSION_H
 
 #include "session.h"
 #include "expression.h"
 #include <QProcess>
 
 class MaximaExpression;
 class MaximaVariableModel;
 
 class MaximaSession : public Cantor::Session
 {
   Q_OBJECT
   public:
     static const QRegExp MaximaOutputPrompt;
     static const QRegExp MaximaInputPrompt;
 
     explicit MaximaSession( Cantor::Backend* backend);
 
     void login() override;
     void logout() override;
 
     Cantor::Expression* evaluateExpression(const QString& command, Cantor::Expression::FinishingBehavior behave = Cantor::Expression::FinishingBehavior::DoNotDelete, bool internal = false) override;
 
     void interrupt() override;
     void sendInputToProcess(const QString&);
 
     void setTypesettingEnabled(bool) override;
 
     Cantor::CompletionObject* completionFor(const QString& command, int index=-1) override;
     Cantor::SyntaxHelpObject* syntaxHelpFor(const QString& command) override;
     QSyntaxHighlighter* syntaxHighlighter(QObject*) override;
     QAbstractItemModel* variableModel() override;
     void runFirstExpression() override;
 
   public Q_SLOTS:
     void readStdOut();
     void readStdErr();
 
   private Q_SLOTS:
     void currentExpressionChangedStatus(Cantor::Expression::Status);
     void restartMaxima();
     void restartsCooledDown();
     void reportProcessError(QProcess::ProcessError);
 
   private:
     void write(const QString&);
 
     QProcess* m_process;
     QString m_cache;
     MaximaVariableModel* m_variableModel;
     bool m_justRestarted;
+    bool m_needUpdate;
 };
 
 #endif /* _MAXIMASESSION_H */
diff --git a/src/backends/maxima/maximavariablemodel.cpp b/src/backends/maxima/maximavariablemodel.cpp
index 74d3408f..93db37e2 100644
--- a/src/backends/maxima/maximavariablemodel.cpp
+++ b/src/backends/maxima/maximavariablemodel.cpp
@@ -1,230 +1,230 @@
 /*
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
     as published by the Free Software Foundation; either version 2
     of the License, or (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA  02110-1301, USA.
 
     ---
     Copyright (C) 2012 Alexander Rieder <alexanderrieder@gmail.com>
  */
 
 #include "maximavariablemodel.h"
 
 #include "maximasession.h"
 #include "maximaexpression.h"
 #include "textresult.h"
 #include "latexresult.h"
 
 #include <QDebug>
 #include <KLocalizedString>
 
 //command used to inspect a maxima variable. %1 is the name of that variable
 const QString MaximaVariableModel::inspectCommand=QLatin1String(":lisp($disp $%1)");
 const QString MaximaVariableModel::variableInspectCommand=QLatin1String(":lisp(cantor-inspect $%1)");
 
-MaximaVariableModel::MaximaVariableModel( MaximaSession* session) : Cantor::DefaultVariableModel(session)
+MaximaVariableModel::MaximaVariableModel( MaximaSession* session) : Cantor::DefaultVariableModel(session),
+m_variableExpression(nullptr),
+m_functionExpression(nullptr)
 {
 }
 
-void MaximaVariableModel::clear()
+void MaximaVariableModel::clearFunctions()
 {
     emit functionsRemoved(functionNames());
     m_functions.clear();
-    DefaultVariableModel::clearVariables();
 }
 
 void MaximaVariableModel::update()
 {
-    qDebug()<<"checking for new variables";
-    const QString& cmd1=variableInspectCommand.arg(QLatin1String("values"));
-    Cantor::Expression* expr1=session()->evaluateExpression(cmd1, Cantor::Expression::FinishingBehavior::DoNotDelete, true);
-    connect(expr1, &Cantor::Expression::statusChanged, this, &MaximaVariableModel::parseNewVariables);
-
-    qDebug()<<"checking for new functions";
-    const QString& cmd2=inspectCommand.arg(QLatin1String("functions"));
-    Cantor::Expression* expr2=session()->evaluateExpression(cmd2, Cantor::Expression::FinishingBehavior::DoNotDelete, true);
-    connect(expr2, &Cantor::Expression::statusChanged, this, &MaximaVariableModel::parseNewFunctions);
+    if (!m_variableExpression)
+    {
+        qDebug()<<"checking for new variables";
+        const QString& cmd1=variableInspectCommand.arg(QLatin1String("values"));
+        m_variableExpression = session()->evaluateExpression(cmd1, Cantor::Expression::FinishingBehavior::DoNotDelete, true);
+        connect(m_variableExpression, &Cantor::Expression::statusChanged, this, &MaximaVariableModel::parseNewVariables);
+    }
+
+    if (!m_functionExpression)
+    {
+        qDebug()<<"checking for new functions";
+        const QString& cmd2=inspectCommand.arg(QLatin1String("functions"));
+        m_functionExpression = session()->evaluateExpression(cmd2, Cantor::Expression::FinishingBehavior::DoNotDelete, true);
+        connect(m_functionExpression, &Cantor::Expression::statusChanged, this, &MaximaVariableModel::parseNewFunctions);
+    }
 }
 
 QList<Cantor::DefaultVariableModel::Variable> parse(MaximaExpression* expr)
 {
-    if(!expr || expr->status()!=Cantor::Expression::Done || expr->results().isEmpty()) {
+    if(!expr
+        || (expr->status()!=Cantor::Expression::Done && expr->errorMessage() != QLatin1String("$DONE"))
+        || expr->results().isEmpty())
+    {
         return QList<Cantor::DefaultVariableModel::Variable>();
     }
 
     //for parsing of names and values below (old code) we need to combine multiple results back to one string
     QString text;
     for (auto* result : expr->results())
     {
         if(result->type()==Cantor::TextResult::Type)
             text += dynamic_cast<Cantor::TextResult*>(result)->plain();
         else if(expr->result()->type()==Cantor::LatexResult::Type)
             text += dynamic_cast<Cantor::LatexResult*>(result)->plain();
     }
 
     const int nameIndex=text.indexOf(QLatin1Char(']'));
     QString namesString=text.left(nameIndex);
     //namesString.chop(1);
     namesString=namesString.mid(1);
     namesString=namesString.trimmed();
 
     qDebug()<<"variable names: "<<namesString;
     if(namesString.isEmpty())
         return QList<Cantor::DefaultVariableModel::Variable>();
 
     QStringList variableNames;
     QString valuesString;
     bool hasValues = false;
     QStringList variableValues;
     if ( namesString.contains(QLatin1Char(')')) )
     {
         //function definition(s): e.g
         //text = "[f1(x),f2(x,y),f3(x,y,z)]\n$DONE"
         //nameString = f1(x),f2(x,y),f3(x,y,z)
         //variableString = "\n$DONE"
         variableNames = namesString.split(QLatin1String("),"));
     }
     else
     {
         //variable definition(s): e.g.
         //text = "[a,b]\n1\n\"-cantor-value-separator-\"\n2\n\"-cantor-value-separator-\"\n($A $B)"
         //nameString = "[a,b]"
         //variableString = "\n1\n\"-cantor-value-separator-\"\n2\n\"-cantor-value-separator-\"\n($A $B)"
         variableNames = namesString.split(QLatin1Char(','));
         valuesString = text.mid(nameIndex+1).trimmed();
         valuesString = valuesString.remove(QLatin1String("\n")); //lists with many elements have line breaks, remove them
         variableValues = valuesString.split(QLatin1String("\"-cantor-value-separator-\""));
         hasValues = variableValues.isEmpty();
     }
 
     qDebug()<<variableNames;
     qDebug()<<"string: "<<valuesString;
     qDebug()<<"values: "<<variableValues;
     qDebug()<<"has Values: "<<hasValues;
 
     QList<Cantor::DefaultVariableModel::Variable> variables;
     variables.reserve(variableNames.size());
     for(int i=0;i<variableNames.size();i++)
     {
         Cantor::DefaultVariableModel::Variable var;
         var.name=variableNames.at(i);;
         if(variableValues.size()>i)
         {
             var.value=variableValues.at(i).trimmed();
             var.value=var.value.remove(QLatin1String("\n")); //lists with many elements have line breaks, remove them
         }
         else
             var.value=QLatin1String("unknown");
 
         variables<<var;
     }
 
     return variables;
 }
 
 void MaximaVariableModel::parseNewVariables(Cantor::Expression::Status status)
 {
     if (status != Cantor::Expression::Done && status != Cantor::Expression::Error)
         return;
 
     qDebug()<<"parsing variables";
-    MaximaExpression* expr=static_cast<MaximaExpression*>(sender());
 
-    QList<Variable> newVars=parse(expr);
+    QList<Variable> newVars=parse(static_cast<MaximaExpression*>(m_variableExpression));
     setVariables(newVars);
 
     //the expression is not needed anymore
-    expr->deleteLater();
+    m_variableExpression->deleteLater();
+    m_variableExpression = nullptr;
 }
 
 void MaximaVariableModel::parseNewFunctions(Cantor::Expression::Status status)
 {
     if (status != Cantor::Expression::Done && status != Cantor::Expression::Error)
         return;
 
     qDebug()<<"parsing functions";
-    MaximaExpression* expr=static_cast<MaximaExpression*>(sender());
 
-    QList<Variable> newVars=parse(expr);
-    QStringList addedVars;
-    QStringList removedVars;
+    // List of variables?
+    QList<Variable> newFuncs=parse(static_cast<MaximaExpression*>(m_functionExpression));
+    QStringList addedFuncs;
+    QStringList removedFuncs;
 
     //remove the old variables
-    for (const Variable& var : m_functions)
+    int i = 0;
+    while (i < m_functions.size())
     {
         //check if this var is present in the new variables
         bool found=false;
-        for (const Variable& var2 : newVars)
-        {
-            if(var.name==var2.name)
+        for (const Variable& func : newFuncs)
+            if(m_functions[i] == func.name)
             {
                 found=true;
                 break;
             }
-        }
 
         if(!found)
         {
-            removeVariable(var);
-            removedVars<<var.name;
+            removedFuncs<<m_functions[i];
+            m_functions.removeAt(i);
         }
+        else
+            i++;
     }
 
-    for (Variable var : newVars)
+    for (Variable func : newFuncs)
     {
-        var.value=i18n("function");
-        addVariable(var);
-        //todo: check if the variable is actually new?
-        addedVars<<var.name;
+        if (!m_functions.contains(func.name))
+        {
+            addedFuncs<<func.name;
+            m_functions.append(func.name);
+        }
     }
 
-    m_functions=newVars;
-
     //the expression is not needed anymore
-    expr->deleteLater();
+    m_functionExpression->deleteLater();
+    m_functionExpression = nullptr;
 
-    emit functionsAdded(addedVars);
-    emit functionsRemoved(removedVars);
-}
-
-bool MaximaVariableModel::isUpdateCommand(const QString& cmd) const
-{
-    return cmd == variableInspectCommand.arg(QLatin1String("values"))
-        || cmd == inspectCommand.arg(QLatin1String("functions"));
+    emit functionsAdded(addedFuncs);
+    emit functionsRemoved(removedFuncs);
 }
 
 MaximaSession* MaximaVariableModel::maximaSession()
 {
     return static_cast<MaximaSession*> (session());
 }
 
-QList<Cantor::DefaultVariableModel::Variable> MaximaVariableModel::functions()
-{
-    return m_functions;
-}
-
 QStringList MaximaVariableModel::functionNames(bool stripParameters)
 {
     QStringList names;
-    for (const Cantor::DefaultVariableModel::Variable& var : m_functions)
+    for (const QString func: m_functions)
     {
-        QString name=var.name;
+        QString name=func;
         if(stripParameters)
         {
             name=name.left(name.lastIndexOf(QLatin1Char('(')));
         }
         names<<name;
     }
 
     return names;
 }
diff --git a/src/backends/maxima/maximavariablemodel.h b/src/backends/maxima/maximavariablemodel.h
index e378cbf6..0141038a 100644
--- a/src/backends/maxima/maximavariablemodel.h
+++ b/src/backends/maxima/maximavariablemodel.h
@@ -1,67 +1,62 @@
 /*
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
     as published by the Free Software Foundation; either version 2
     of the License, or (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA  02110-1301, USA.
 
     ---
     Copyright (C) 2012 Alexander Rieder <alexanderrieder@gmail.com>
  */
 
 #ifndef _MAXIMAVARIABLEMODEL_H
 #define _MAXIMAVARIABLEMODEL_H
 
 #include "defaultvariablemodel.h"
 #include <QStringList>
 
 class MaximaSession;
 
 class MaximaVariableModel : public Cantor::DefaultVariableModel
 {
   Q_OBJECT
   public:
     static const QString inspectCommand;
     static const QString variableInspectCommand;
 
     explicit MaximaVariableModel( MaximaSession* session);
     ~MaximaVariableModel() override = default;
 
-    void clear();
-
-    QList<Variable> functions();
+    void clearFunctions();
 
     QStringList functionNames(bool stripParameters=false);
 
-    bool isUpdateCommand(const QString &cmd) const;
-
-  public Q_SLOTS:
     void update() override;
 
   private Q_SLOTS:
     void parseNewVariables(Cantor::Expression::Status status);
     void parseNewFunctions(Cantor::Expression::Status status);
 
   Q_SIGNALS:
-    void functionsAdded(const QStringList variables);
-    void functionsRemoved(const QStringList variables);
+    void functionsAdded(const QStringList funcs);
+    void functionsRemoved(const QStringList funcs);
 
   private:
     MaximaSession* maximaSession();
 
   private:
-    QList<Variable> m_functions;
+    QStringList m_functions;
     Cantor::Expression* m_variableExpression;
     Cantor::Expression* m_functionExpression;
 };
 
 #endif /* _MAXIMAVARIABLEMODEL_H */