diff --git a/Modules/Simulation/mitkExportMitkVisitor.cpp b/Modules/Simulation/mitkExportMitkVisitor.cpp
index 6c7cd634dd..c0645954c3 100644
--- a/Modules/Simulation/mitkExportMitkVisitor.cpp
+++ b/Modules/Simulation/mitkExportMitkVisitor.cpp
@@ -1,230 +1,230 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "mitkExportMitkVisitor.h"
 #include <mitkNodePredicateDataType.h>
 #include <mitkSimulation.h>
 #include <mitkSurface.h>
 #include <sofa/component/visualmodel/VisualModelImpl.h>
 #include <vtkCellArray.h>
 #include <vtkFloatArray.h>
 #include <vtkPointData.h>
 #include <vtkPolyData.h>
 #include <vtkSmartPointer.h>
 
-static void ApplyMaterial(mitk::DataNode::Pointer dataNode, const sofa::core::loader::Material& material)
+void ApplyMaterial(mitk::DataNode::Pointer dataNode, const sofa::core::loader::Material& material)
 {
   using sofa::defaulttype::Vec4f;
 
   if (dataNode.IsNull() || dynamic_cast<mitk::Surface*>(dataNode->GetData()) == NULL)
     return;
 
   if (material.useDiffuse)
     dataNode->SetFloatProperty("opacity", material.diffuse[3]);
 
   Vec4f ambient = material.useAmbient ? material.ambient : Vec4f();
   Vec4f diffuse = material.useDiffuse ? material.diffuse : Vec4f();
   Vec4f specular = material.useSpecular ? material.specular : Vec4f();
   float shininess = material.useShininess ? std::min(material.shininess, 128.0f) : 45.0f;
 
   if (shininess == 0.0f)
   {
     specular.clear();
     shininess = 1.0f;
   }
 
   dataNode->SetFloatProperty("material.ambientCoefficient", 1.0f);
   dataNode->SetProperty("material.ambientColor", mitk::ColorProperty::New(ambient.elems));
 
   dataNode->SetFloatProperty("material.diffuseCoefficient", 1.0f);
   dataNode->SetProperty("color", mitk::ColorProperty::New(diffuse.elems));
 
   dataNode->SetFloatProperty("material.specularCoefficient", 1.0f);
   dataNode->SetProperty("material.specularColor", mitk::ColorProperty::New(specular.elems));
   dataNode->SetFloatProperty("material.specularPower", shininess);
 }
 
 static mitk::DataNode::Pointer GetSimulationDataNode(mitk::DataStorage::Pointer dataStorage, sofa::core::objectmodel::BaseNode::SPtr rootNode)
 {
   if (dataStorage.IsNull())
     return NULL;
 
   if (!rootNode)
     return NULL;
 
   mitk::TNodePredicateDataType<mitk::Simulation>::Pointer predicate = mitk::TNodePredicateDataType<mitk::Simulation>::New();
   mitk::DataStorage::SetOfObjects::ConstPointer subset = dataStorage->GetSubset(predicate);
 
   for (mitk::DataStorage::SetOfObjects::ConstIterator it = subset->Begin(); it != subset->End(); ++it)
   {
     mitk::DataNode::Pointer dataNode = it.Value();
     mitk::Simulation::Pointer simulation = static_cast<mitk::Simulation*>(dataNode->GetData());
 
     if (simulation->GetRootNode() == rootNode)
       return dataNode;
   }
 
   return NULL;
 }
 
 
 mitk::ExportMitkVisitor::ExportMitkVisitor(DataStorage::Pointer dataStorage, const sofa::core::ExecParams* params)
   : Visitor(params),
     m_DataStorage(dataStorage)
 {
 }
 
 mitk::ExportMitkVisitor::ExportMitkVisitor(DataStorage::Pointer dataStorage, const std::string& visualModelName, const sofa::core::ExecParams* params)
   : Visitor(params),
     m_DataStorage(dataStorage),
     m_VisualModelName(visualModelName)
 {
 }
 
 mitk::ExportMitkVisitor::~ExportMitkVisitor()
 {
 }
 
 sofa::simulation::Visitor::Result mitk::ExportMitkVisitor::processNodeTopDown(sofa::simulation::Node* node)
 {
   if (m_DataStorage.IsNotNull())
   {
     for_each(this, node, node->visualModel, &ExportMitkVisitor::processVisualModel);
     return RESULT_CONTINUE;
   }
 
   return RESULT_PRUNE;
 }
 
 void mitk::ExportMitkVisitor::processVisualModel(sofa::simulation::Node* node, sofa::core::visual::VisualModel* visualModel)
 {
   using sofa::defaulttype::ResizableExtVector;
   typedef sofa::component::visualmodel::VisualModelImpl::VecCoord VecCoord;
   typedef sofa::component::visualmodel::VisualModelImpl::Triangle Triangle;
   typedef sofa::component::visualmodel::VisualModelImpl::Quad Quad;
   typedef sofa::component::visualmodel::VisualModelImpl::Deriv Deriv;
   typedef sofa::component::visualmodel::VisualModelImpl::VecTexCoord VecTexCoord;
 
   sofa::component::visualmodel::VisualModelImpl* visualModelImpl = dynamic_cast<sofa::component::visualmodel::VisualModelImpl*>(visualModel);
 
   if (visualModelImpl == NULL)
     return;
 
   if (!m_VisualModelName.empty() && m_VisualModelName != visualModelImpl->name.getValue())
     return;
 
   vtkSmartPointer<vtkPolyData> polyData = vtkSmartPointer<vtkPolyData>::New();
   vtkSmartPointer<vtkPoints> points = vtkSmartPointer<vtkPoints>::New();
 
   const VecCoord& vertices = visualModelImpl->m_vertices2.getValue().empty()
     ? visualModelImpl->m_positions.getValue()
     : visualModelImpl->m_vertices2.getValue();
 
   size_t numPoints = vertices.size();
 
   points->SetNumberOfPoints(numPoints);
 
   for (size_t i = 0; i < numPoints; ++i)
     points->SetPoint(i, vertices[i].elems);
 
   polyData->SetPoints(points);
 
   vtkSmartPointer<vtkCellArray> polys = vtkSmartPointer<vtkCellArray>::New();
   const ResizableExtVector<Triangle>& triangles = visualModelImpl->m_triangles.getValue();
 
   if (!triangles.empty())
   {
     ResizableExtVector<Triangle>::const_iterator trianglesEnd = triangles.end();
 
     for (ResizableExtVector<Triangle>::const_iterator it = triangles.begin(); it != trianglesEnd; ++it)
     {
       const Triangle& triangle = *it;
 
       polys->InsertNextCell(3);
       polys->InsertCellPoint(triangle[0]);
       polys->InsertCellPoint(triangle[1]);
       polys->InsertCellPoint(triangle[2]);
     }
   }
 
   const ResizableExtVector<Quad>& quads = visualModelImpl->m_quads.getValue();
 
   if (!quads.empty())
   {
     ResizableExtVector<Quad>::const_iterator quadsEnd = quads.end();
 
     for (ResizableExtVector<Quad>::const_iterator it = quads.begin(); it != quadsEnd; ++it)
     {
       const Quad& quad = *it;
 
       polys->InsertNextCell(4);
       polys->InsertCellPoint(quad[0]);
       polys->InsertCellPoint(quad[1]);
       polys->InsertCellPoint(quad[2]);
       polys->InsertCellPoint(quad[3]);
     }
   }
 
   polyData->SetPolys(polys);
 
   const ResizableExtVector<Deriv>& normals = visualModelImpl->m_vnormals.getValue();
 
   if (!normals.empty())
   {
     size_t numNormals = normals.size();
 
     vtkSmartPointer<vtkFloatArray> vtkNormals = vtkSmartPointer<vtkFloatArray>::New();
     vtkNormals->SetNumberOfComponents(3);
     vtkNormals->SetNumberOfTuples(numNormals);
 
     for (size_t i = 0; i < numNormals; ++i)
       vtkNormals->SetTuple(i, normals[i].elems);
 
     polyData->GetPointData()->SetNormals(vtkNormals);
   }
 
   const VecTexCoord& texCoords = visualModelImpl->m_vtexcoords.getValue();
 
   if (!texCoords.empty())
   {
     size_t numTexCoords = texCoords.size();
 
     vtkSmartPointer<vtkFloatArray> vtkTexCoords = vtkSmartPointer<vtkFloatArray>::New();
     vtkTexCoords->SetNumberOfComponents(2);
     vtkTexCoords->SetNumberOfTuples(numTexCoords);
 
     for (size_t i = 0; i < numTexCoords; ++i)
       vtkTexCoords->SetTuple(i, texCoords[i].elems);
 
     polyData->GetPointData()->SetTCoords(vtkTexCoords);
   }
 
   Surface::Pointer surface = Surface::New();
   surface->SetVtkPolyData(polyData);
 
   DataNode::Pointer dataNode = DataNode::New();
   dataNode->SetName(visualModelImpl->name.getValue());
   dataNode->SetData(surface);
 
   ApplyMaterial(dataNode, visualModelImpl->material.getValue());
 
   DataNode::Pointer parentDataNode = GetSimulationDataNode(m_DataStorage, node->getRoot());
 
   if (parentDataNode.IsNotNull())
     surface->SetGeometry(parentDataNode->GetData()->GetGeometry());
 
   m_DataStorage->Add(dataNode, parentDataNode);
 }
diff --git a/Modules/Simulation/mitkVtkModel.cpp b/Modules/Simulation/mitkVtkModel.cpp
index 2fe091b485..5dadba56c1 100644
--- a/Modules/Simulation/mitkVtkModel.cpp
+++ b/Modules/Simulation/mitkVtkModel.cpp
@@ -1,613 +1,633 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "mitkVtkModel.h"
 #include <mitkLogMacros.h>
 #include <mitkRenderingManager.h>
 #include <sofa/core/visual/VisualParams.h>
 #include <vtkCellArray.h>
 #include <vtkFloatArray.h>
 #include <vtkImageData.h>
 #include <vtkImageReader2.h>
 #include <vtkImageReader2Factory.h>
 #include <vtkPointData.h>
 #include <vtkPolyData.h>
 #include <vtkOpenGLTexture.h>
 
+// Defined in mitkExportMitkVisitor.cpp
+void ApplyMaterial(mitk::DataNode::Pointer dataNode, const sofa::core::loader::Material& material);
+
 static bool InitGLEW()
 {
   static bool isInitialized = false;
 
   // If no render window is shown, OpenGL is potentially not initialized, e.g., the
   // Display tab of the Workbench might be closed while loading a SOFA scene file.
   // In this case initialization is deferred (see mitk::VtkModel::internalDraw()).
   if (mitk::RenderingManager::GetInstance()->GetAllRegisteredRenderWindows().empty())
     return false;
 
   if (!isInitialized)
   {
     GLenum error = glewInit();
 
     if (error != GLEW_OK)
     {
       MITK_ERROR("glewInit") << glewGetErrorString(error);
     }
     else
     {
       isInitialized = true;
     }
   }
 
   return isInitialized;
 }
 
 mitk::VtkModel::VtkModel()
   : m_GlewIsInitialized(InitGLEW()),
     m_BuffersWereCreated(false),
     m_LastNumberOfVertices(0),
     m_LastNumberOfTriangles(0),
     m_LastNumberOfQuads(0),
     m_VertexBuffer(0),
     m_IndexBuffer(0),
     m_VtkRenderer(NULL),
     m_Mode(OpenGL)
 {
 }
 
 mitk::VtkModel::~VtkModel()
 {
   if (m_Mode == OpenGL && m_BuffersWereCreated)
   {
     glDeleteBuffers(1, &m_IndexBuffer);
     glDeleteBuffers(1, &m_VertexBuffer);
   }
 }
 
 void mitk::VtkModel::CreateIndexBuffer()
 {
   if (m_Mode == OpenGL)
   {
     glGenBuffers(1, &m_IndexBuffer);
   }
   else if (m_Mode == Surface)
   {
     m_Polys = vtkSmartPointer<vtkCellArray>::New();
   }
 
   this->InitIndexBuffer();
 }
 
 void mitk::VtkModel::CreateVertexBuffer()
 {
   if (m_Mode == OpenGL)
   {
     glGenBuffers(1, &m_VertexBuffer);
   }
   else if (m_Mode == Surface)
   {
     m_Points = vtkSmartPointer<vtkPoints>::New();
     m_Normals = vtkSmartPointer<vtkFloatArray>::New();
     m_TexCoords = vtkSmartPointer<vtkFloatArray>::New();
   }
 
   this->InitVertexBuffer();
 }
 
-void mitk::VtkModel::DrawGroup(int group, bool)
+void mitk::VtkModel::DrawGroup(int group, bool transparent)
+{
+  if (m_Mode == OpenGL)
+  {
+    this->DrawOpenGLGroup(group, transparent);
+  }
+  else if (m_Mode == Surface)
+  {
+    this->DrawSurfaceGroup(group, transparent);
+  }
+}
+
+void mitk::VtkModel::DrawOpenGLGroup(int group, bool)
 {
   using sofa::core::loader::Material;
   using sofa::defaulttype::ResizableExtVector;
   using sofa::defaulttype::Vec4f;
 
-  if (m_Mode == OpenGL)
-  {
-    const VecCoord& vertices = this->getVertices();
-    const ResizableExtVector<Deriv>& normals = this->getVnormals();
-    const ResizableExtVector<Triangle>& triangles = this->getTriangles();
-    const ResizableExtVector<Quad>& quads = this->getQuads();
+  const VecCoord& vertices = this->getVertices();
+  const ResizableExtVector<Deriv>& normals = this->getVnormals();
+  const ResizableExtVector<Triangle>& triangles = this->getTriangles();
+  const ResizableExtVector<Quad>& quads = this->getQuads();
 
-    FaceGroup faceGroup;
+  FaceGroup faceGroup;
 
-    if (group == -1)
-    {
-      faceGroup.nbt = triangles.size();
-      faceGroup.nbq = quads.size();
-    }
-    else
-    {
-      faceGroup = groups.getValue()[group];
-    }
+  if (group == -1)
+  {
+    faceGroup.nbt = triangles.size();
+    faceGroup.nbq = quads.size();
+  }
+  else
+  {
+    faceGroup = groups.getValue()[group];
+  }
 
-    Material material = faceGroup.materialId != -1
-      ? materials.getValue()[faceGroup.materialId]
-      : this->material.getValue();
+  Material material = faceGroup.materialId != -1
+    ? materials.getValue()[faceGroup.materialId]
+    : this->material.getValue();
 
-    if (material.useTexture && material.activated)
-    {
-      m_Textures[faceGroup.materialId]->Load(m_VtkRenderer);
-
-      glEnable(GL_TEXTURE_2D);
-      glTexCoordPointer(2, GL_FLOAT, 0, reinterpret_cast<const GLvoid*>(vertices.size() * sizeof(VecCoord::value_type) + normals.size() * sizeof(Deriv)));
-      glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-    }
+  if (material.useTexture && material.activated)
+  {
+    m_Textures[faceGroup.materialId]->Load(m_VtkRenderer);
 
-    Vec4f ambient = material.useAmbient ? material.ambient : Vec4f();
-    Vec4f diffuse = material.useDiffuse ? material.diffuse : Vec4f();
-    Vec4f specular = material.useSpecular ? material.specular : Vec4f();
-    Vec4f emissive = material.useEmissive ? material.emissive : Vec4f();
-    float shininess = material.useShininess ? std::min(material.shininess, 128.0f) : 45.0f;
+    glEnable(GL_TEXTURE_2D);
+    glTexCoordPointer(2, GL_FLOAT, 0, reinterpret_cast<const GLvoid*>(vertices.size() * sizeof(VecCoord::value_type) + normals.size() * sizeof(Deriv)));
+    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+  }
 
-    if (shininess == 0.0f)
-    {
-      specular.clear();
-      shininess = 1.0f;
-    }
+  Vec4f ambient = material.useAmbient ? material.ambient : Vec4f();
+  Vec4f diffuse = material.useDiffuse ? material.diffuse : Vec4f();
+  Vec4f specular = material.useSpecular ? material.specular : Vec4f();
+  Vec4f emissive = material.useEmissive ? material.emissive : Vec4f();
+  float shininess = material.useShininess ? std::min(material.shininess, 128.0f) : 45.0f;
 
-    glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, ambient.ptr());
-    glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, diffuse.ptr());
-    glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, specular.ptr());
-    glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, emissive.ptr());
-    glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shininess);
+  if (shininess == 0.0f)
+  {
+    specular.clear();
+    shininess = 1.0f;
+  }
 
-    if (faceGroup.nbt != 0)
-      glDrawElements(GL_TRIANGLES, faceGroup.nbt * 3, GL_UNSIGNED_INT, reinterpret_cast<const GLvoid*>(faceGroup.tri0 * sizeof(Triangle)));
+  glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, ambient.ptr());
+  glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, diffuse.ptr());
+  glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, specular.ptr());
+  glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, emissive.ptr());
+  glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shininess);
 
-    if (faceGroup.nbq != 0)
-      glDrawElements(GL_QUADS, faceGroup.nbq * 4, GL_UNSIGNED_INT, reinterpret_cast<const GLvoid*>(triangles.size() * sizeof(Triangle) + faceGroup.quad0 * sizeof(Quad)));
+  if (faceGroup.nbt != 0)
+    glDrawElements(GL_TRIANGLES, faceGroup.nbt * 3, GL_UNSIGNED_INT, reinterpret_cast<const GLvoid*>(faceGroup.tri0 * sizeof(Triangle)));
 
-    if (material.useTexture && material.activated)
-    {
-      glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-      glDisable(GL_TEXTURE_2D);
+  if (faceGroup.nbq != 0)
+    glDrawElements(GL_QUADS, faceGroup.nbq * 4, GL_UNSIGNED_INT, reinterpret_cast<const GLvoid*>(triangles.size() * sizeof(Triangle) + faceGroup.quad0 * sizeof(Quad)));
 
-      m_Textures[faceGroup.materialId]->PostRender(m_VtkRenderer);
-    }
-  }
-  else if (m_Mode == Surface)
+  if (material.useTexture && material.activated)
   {
-    m_PolyData->SetPoints(m_Points);
-    m_PolyData->SetPolys(m_Polys);
-    m_PolyData->GetPointData()->SetNormals(m_Normals);
-    m_PolyData->GetPointData()->SetTCoords(m_TexCoords);
-    m_PolyData->Modified();
+    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+    glDisable(GL_TEXTURE_2D);
+
+    m_Textures[faceGroup.materialId]->PostRender(m_VtkRenderer);
   }
 }
 
+void mitk::VtkModel::DrawSurfaceGroup(int group, bool)
+{
+  m_PolyData->SetPoints(m_Points);
+  m_PolyData->SetPolys(m_Polys);
+
+  vtkPointData* pointData = m_PolyData->GetPointData();
+
+  pointData->SetNormals(m_Normals->GetSize() != 0
+    ? m_Normals
+    : NULL);
+
+  pointData->SetTCoords(m_TexCoords->GetSize() != 0
+    ? m_TexCoords
+    : NULL);
+
+  m_PolyData->Modified();
+}
+
 void mitk::VtkModel::DrawGroups(bool transparent)
 {
   using sofa::core::objectmodel::Data;
   using sofa::helper::ReadAccessor;
   using sofa::helper::vector;
 
   ReadAccessor<Data<vector<FaceGroup> > > groups = this->groups;
 
   if (groups.empty())
   {
     this->DrawGroup(-1, transparent);
   }
   else
   {
     int numGroups = static_cast<int>(groups.size());
 
     for (int i = 0; i < numGroups; ++i)
       this->DrawGroup(i, transparent);
   }
 }
 
 void mitk::VtkModel::InitIndexBuffer()
 {
   using sofa::defaulttype::ResizableExtVector;
 
   const ResizableExtVector<Triangle>& triangles = this->getTriangles();
   const ResizableExtVector<Quad>& quads = this->getQuads();
 
   if (m_Mode == OpenGL)
   {
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_IndexBuffer);
     glBufferData(GL_ELEMENT_ARRAY_BUFFER, triangles.size() * sizeof(Triangle) + quads.size() * sizeof(Quad), NULL, GL_DYNAMIC_DRAW);
   }
-  else if (m_Mode == Surface)
-  {
-    m_Polys->Initialize();
-  }
 
   this->UpdateIndexBuffer();
 }
 
 void mitk::VtkModel::InitVertexBuffer()
 {
   using sofa::defaulttype::ResizableExtVector;
 
   const VecCoord& vertices = this->getVertices();
   const ResizableExtVector<Deriv> normals = this->getVnormals();
   const VecTexCoord& texCoords = this->getVtexcoords();
 
   if (m_Mode == OpenGL)
   {
     glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer);
     glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(VecCoord::value_type) + normals.size() * sizeof(Deriv) + texCoords.size() * sizeof(VecTexCoord::value_type), NULL, GL_DYNAMIC_DRAW);
   }
   else if (m_Mode == Surface)
   {
     m_Points->SetNumberOfPoints(vertices.size());
 
     m_Normals->SetNumberOfComponents(3);
     m_Normals->SetNumberOfTuples(normals.size());
 
     m_TexCoords->SetNumberOfComponents(2);
     m_TexCoords->SetNumberOfTuples(texCoords.size());
   }
 
   this->UpdateVertexBuffer();
 }
 
 void mitk::VtkModel::internalDraw(const sofa::core::visual::VisualParams* vparams, bool transparent)
 {
   using sofa::core::visual::DisplayFlags;
   using sofa::defaulttype::ResizableExtVector;
 
   if (m_Mode == OpenGL && !m_GlewIsInitialized)
   {
     // Try lazy initialization since initialization potentially failed so far
     // due to missing render windows (see InitGLEW()).
     m_GlewIsInitialized = InitGLEW();
 
     if (m_GlewIsInitialized)
     {
       this->updateBuffers();
     }
     else
     {
       return;
     }
   }
 
   const DisplayFlags& displayFlags = vparams->displayFlags();
 
   if (!displayFlags.getShowVisualModels())
     return;
 
   if (m_BuffersWereCreated == false)
     return;
 
   if (m_Mode == OpenGL)
   {
     glEnable(GL_LIGHTING);
     glColor3f(1.0f, 1.0f, 1.0f);
     glPolygonMode(GL_FRONT_AND_BACK, displayFlags.getShowWireFrame() ? GL_LINE : GL_FILL);
 
     const VecCoord& vertices = this->getVertices();
 
     glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer);
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_IndexBuffer);
 
     this->ValidateBoundBuffers();
 
     glVertexPointer(3, GL_FLOAT, 0, NULL);
     glNormalPointer(GL_FLOAT, 0, reinterpret_cast<const GLvoid*>(vertices.size() * sizeof(VecCoord::value_type)));
     glEnableClientState(GL_VERTEX_ARRAY);
     glEnableClientState(GL_NORMAL_ARRAY);
   }
 
   this->DrawGroups(transparent);
 
   if (m_Mode == OpenGL)
   {
     glDisableClientState(GL_NORMAL_ARRAY);
     glDisableClientState(GL_VERTEX_ARRAY);
 
     if (displayFlags.getShowWireFrame())
       glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 
     glDisable(GL_LIGHTING);
   }
 
   if (displayFlags.getShowNormals())
     this->DrawNormals();
 }
 
 void mitk::VtkModel::DrawNormals()
 {
   using sofa::defaulttype::ResizableExtVector;
 
   if (m_Mode == OpenGL)
   {
     const VecCoord& vertices = this->getVertices();
     const ResizableExtVector<Deriv>& normals = this->getVnormals();
     size_t numVertices = vertices.size();
     Coord normal;
 
     glBegin(GL_LINES);
 
     for (size_t i = 0; i < numVertices; ++i)
     {
       glVertex3fv(vertices[i].ptr());
       normal = vertices[i] + normals[i];
       glVertex3fv(normal.ptr());
     }
 
     glEnd();
   }
 }
 
 bool mitk::VtkModel::loadTextures()
 {
   using sofa::helper::system::DataRepository;
   using sofa::helper::vector;
   using sofa::core::loader::Material;
 
   m_Textures.clear();
 
   std::vector<unsigned int> materialIndices;
 
   const vector<Material>& materials = this->materials.getValue();
   unsigned int numMaterials = materials.size();
 
   for (unsigned int i = 0; i < numMaterials; ++i)
   {
     const Material& material = materials[i];
 
     if (material.useTexture && material.activated)
       materialIndices.push_back(i);
   }
 
   bool retValue = true;
   size_t numTextures = materialIndices.size();
 
   for (size_t i = 0; i < numTextures; ++i)
   {
     std::string filename = materials[materialIndices[i]].textureFilename;
 
     if (!DataRepository.findFile(filename))
     {
       MITK_ERROR("VtkModel") << "File \"" << filename << "\" not found!";
       retValue = false;
       continue;
     }
 
     vtkSmartPointer<vtkImageReader2> imageReader = vtkSmartPointer<vtkImageReader2>::Take(vtkImageReader2Factory::CreateImageReader2(filename.c_str()));
 
     if (imageReader == NULL)
     {
       MITK_ERROR("VtkModel") << "File \"" << filename << "\" has unknown image format!";
       retValue = false;
       continue;
     }
 
     imageReader->SetFileName(filename.c_str());
     imageReader->UpdateWholeExtent();
 
     vtkSmartPointer<vtkOpenGLTexture> texture = vtkSmartPointer<vtkOpenGLTexture>::New();
     texture->SetInputConnection(imageReader->GetOutputPort());
     texture->InterpolateOn();
 
     m_Textures.insert(std::make_pair(materialIndices[i], texture));
   }
 
   return retValue;
 }
 
 mitk::DataNode::Pointer mitk::VtkModel::GetDataNode() const
 {
   return m_DataNode;
 }
 
 mitk::VtkModel::Mode mitk::VtkModel::GetMode() const
 {
   return m_Mode;
 }
 
 void mitk::VtkModel::SetMode(Mode mode)
 {
   if (m_Mode == mode)
     return;
 
   if (mode == OpenGL)
   {
     m_DataNode = NULL;
     m_Surface = NULL;
     m_PolyData = NULL;
     m_TexCoords = NULL;
     m_Normals = NULL;
     m_Polys = NULL;
     m_Points = NULL;
   }
   else if (mode == Surface)
   {
     if (m_Mode == OpenGL && m_BuffersWereCreated)
     {
       glDeleteBuffers(1, &m_IndexBuffer);
       m_IndexBuffer = 0;
 
       glDeleteBuffers(1, &m_VertexBuffer);
       m_VertexBuffer = 0;
     }
 
     m_PolyData = vtkSmartPointer<vtkPolyData>::New();
 
     m_Surface = Surface::New();
     m_Surface->SetVtkPolyData(m_PolyData);
 
     m_DataNode = DataNode::New();
     m_DataNode->SetName(name.getValue());
     m_DataNode->SetData(m_Surface);
+
+    ApplyMaterial(m_DataNode, this->material.getValue());
   }
 
   m_Mode = mode;
 
   m_BuffersWereCreated = false;
   this->updateBuffers();
 }
 
 void mitk::VtkModel::SetVtkRenderer(vtkRenderer* renderer)
 {
   m_VtkRenderer = renderer;
 }
 
 void mitk::VtkModel::updateBuffers()
 {
   using sofa::defaulttype::ResizableExtVector;
 
   if (m_Mode == OpenGL && !m_GlewIsInitialized)
     return;
 
   const VecCoord& vertices = this->getVertices();
   const ResizableExtVector<Triangle>& triangles = this->getTriangles();
   const ResizableExtVector<Quad>& quads = this->getQuads();
 
   if (!m_BuffersWereCreated)
   {
     this->CreateVertexBuffer();
     this->CreateIndexBuffer();
 
     m_BuffersWereCreated = true;
   }
   else
   {
     if (m_LastNumberOfVertices != vertices.size())
       this->InitVertexBuffer();
     else
       this->UpdateVertexBuffer();
 
     if (m_LastNumberOfTriangles != triangles.size() || m_LastNumberOfQuads != quads.size())
       this->InitIndexBuffer();
     else
       this->UpdateIndexBuffer();
   }
 
   m_LastNumberOfVertices = vertices.size();
   m_LastNumberOfTriangles = triangles.size();
   m_LastNumberOfQuads = quads.size();
 }
 
 void mitk::VtkModel::UpdateIndexBuffer()
 {
   using sofa::defaulttype::ResizableExtVector;
 
   const ResizableExtVector<Triangle>& triangles = this->getTriangles();
   const ResizableExtVector<Quad>& quads = this->getQuads();
 
   GLsizeiptr sizeOfTriangleIndices = triangles.size() * sizeof(Triangle);
   GLsizeiptr sizeOfQuadIndices = quads.size() * sizeof(Quad);
 
   if (m_Mode == OpenGL)
   {
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_IndexBuffer);
     glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, sizeOfTriangleIndices, triangles.getData());
     glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, sizeOfTriangleIndices, sizeOfQuadIndices, quads.getData());
   }
   else if (m_Mode == Surface)
   {
     m_Polys->Initialize();
 
     if (!triangles.empty())
     {
       ResizableExtVector<Triangle>::const_iterator trianglesEnd = triangles.end();
 
       for (ResizableExtVector<Triangle>::const_iterator it = triangles.begin(); it != trianglesEnd; ++it)
       {
         const Triangle& triangle = *it;
 
         m_Polys->InsertNextCell(3);
         m_Polys->InsertCellPoint(triangle[0]);
         m_Polys->InsertCellPoint(triangle[1]);
         m_Polys->InsertCellPoint(triangle[2]);
       }
     }
 
     if (!quads.empty())
     {
       ResizableExtVector<Quad>::const_iterator quadsEnd = quads.end();
 
       for (ResizableExtVector<Quad>::const_iterator it = quads.begin(); it != quadsEnd; ++it)
       {
         const Quad& quad = *it;
 
         m_Polys->InsertNextCell(4);
         m_Polys->InsertCellPoint(quad[0]);
         m_Polys->InsertCellPoint(quad[1]);
         m_Polys->InsertCellPoint(quad[2]);
         m_Polys->InsertCellPoint(quad[3]);
       }
     }
   }
 }
 
 void mitk::VtkModel::UpdateVertexBuffer()
 {
   using sofa::defaulttype::ResizableExtVector;
 
   const VecCoord& vertices = this->getVertices();
   const ResizableExtVector<Deriv> normals = this->getVnormals();
   const VecTexCoord& texCoords = this->getVtexcoords();
 
   if (m_Mode == OpenGL)
   {
     GLsizeiptr sizeOfVertices = vertices.size() * sizeof(VecCoord::value_type);
     GLsizeiptr sizeOfNormals = normals.size() * sizeof(Deriv);
 
     glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer);
     glBufferSubData(GL_ARRAY_BUFFER, 0, sizeOfVertices, vertices.getData());
     glBufferSubData(GL_ARRAY_BUFFER, sizeOfVertices, sizeOfNormals, normals.getData());
 
     if (!m_Textures.empty())
     {
       GLsizeiptr sizeOfTexCoords = texCoords.size() * sizeof(VecTexCoord::value_type);
       glBufferSubData(GL_ARRAY_BUFFER, sizeOfVertices + sizeOfNormals, sizeOfTexCoords, texCoords.getData());
     }
   }
   else if (m_Mode == Surface)
   {
     size_t numPoints = vertices.size();
 
     for (size_t i = 0; i < numPoints; ++i)
       m_Points->SetPoint(i, vertices[i].elems);
 
     if (!normals.empty())
     {
       size_t numNormals = normals.size();
 
       for (size_t i = 0; i < numNormals; ++i)
         m_Normals->SetTuple(i, normals[i].elems);
     }
 
     if (!texCoords.empty())
     {
       size_t numTexCoords = texCoords.size();
 
       for (size_t i = 0; i < numTexCoords; ++i)
         m_TexCoords->SetTuple(i, normals[i].elems);
     }
   }
 }
 
 void mitk::VtkModel::ValidateBoundBuffers()
 {
   if (m_Mode != OpenGL)
     return;
 
   GLint indexBufferSize;
   glGetBufferParameteriv(GL_ELEMENT_ARRAY_BUFFER, GL_BUFFER_SIZE, &indexBufferSize);
 
   if (indexBufferSize == 0)
   {
     glDeleteBuffers(1, &m_IndexBuffer);
     this->CreateIndexBuffer();
 
     glDeleteBuffers(1, &m_VertexBuffer);
     this->CreateVertexBuffer();
   }
 }
diff --git a/Modules/Simulation/mitkVtkModel.h b/Modules/Simulation/mitkVtkModel.h
index f61d12029d..78c70ab6b6 100644
--- a/Modules/Simulation/mitkVtkModel.h
+++ b/Modules/Simulation/mitkVtkModel.h
@@ -1,97 +1,99 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef mitkVtkModel_h
 #define mitkVtkModel_h
 
 #include <mitkDataNode.h>
 #include <mitkPoint.h>
 #include <mitkSurface.h>
 #include <mitkVector.h>
 #include <sofa/component/visualmodel/VisualModelImpl.h>
 #include <sofa/helper/system/gl.h>
 #include <vtkCellArray.h>
 #include <vtkFloatArray.h>
 #include <vtkPoints.h>
 #include <vtkPolyData.h>
 #include <vtkSmartPointer.h>
 #include <MitkSimulationExports.h>
 
 class vtkOpenGLTexture;
 class vtkRenderer;
 
 namespace mitk
 {
   class MitkSimulation_EXPORT VtkModel : public sofa::component::visualmodel::VisualModelImpl
   {
   public:
     enum Mode
     {
       OpenGL,
       Surface
     };
 
     SOFA_CLASS(VtkModel, sofa::component::visualmodel::VisualModelImpl);
 
     void internalDraw(const sofa::core::visual::VisualParams* vparams, bool transparent);
     bool loadTextures();
     void SetVtkRenderer(vtkRenderer* renderer);
     void updateBuffers();
 
     DataNode::Pointer GetDataNode() const;
 
     Mode GetMode() const;
     void SetMode(Mode mode);
 
   private:
     VtkModel();
     ~VtkModel();
 
     VtkModel(MyType&);
     MyType& operator=(const MyType&);
 
     void CreateIndexBuffer();
     void CreateVertexBuffer();
-    void DrawGroup(int group, bool);
+    void DrawGroup(int group, bool transparent);
+    void DrawOpenGLGroup(int group, bool transparent);
+    void DrawSurfaceGroup(int group, bool transparent);
     void DrawGroups(bool transparent);
     void DrawNormals();
     void InitIndexBuffer();
     void InitVertexBuffer();
     void UpdateIndexBuffer();
     void UpdateVertexBuffer();
     void ValidateBoundBuffers();
 
     bool m_GlewIsInitialized;
     bool m_BuffersWereCreated;
     size_t m_LastNumberOfVertices;
     size_t m_LastNumberOfTriangles;
     size_t m_LastNumberOfQuads;
     GLuint m_VertexBuffer;
     GLuint m_IndexBuffer;
     std::map<unsigned int, vtkSmartPointer<vtkOpenGLTexture> > m_Textures;
     vtkRenderer* m_VtkRenderer;
     Mode m_Mode;
     vtkSmartPointer<vtkPoints> m_Points;
     vtkSmartPointer<vtkCellArray> m_Polys;
     vtkSmartPointer<vtkFloatArray> m_Normals;
     vtkSmartPointer<vtkFloatArray> m_TexCoords;
     vtkSmartPointer<vtkPolyData> m_PolyData;
     Surface::Pointer m_Surface;
     DataNode::Pointer m_DataNode;
   };
 }
 
 #endif