diff --git a/Modules/IGT/IGTFilters/mitkNavigationDataEvaluationFilter.cpp b/Modules/IGT/IGTFilters/mitkNavigationDataEvaluationFilter.cpp
index 10fc62d6a7..e633e36ca5 100644
--- a/Modules/IGT/IGTFilters/mitkNavigationDataEvaluationFilter.cpp
+++ b/Modules/IGT/IGTFilters/mitkNavigationDataEvaluationFilter.cpp
@@ -1,89 +1,240 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision: 16011 $
 
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
 #include "mitkNavigationDataEvaluationFilter.h"
 
 
 mitk::NavigationDataEvaluationFilter::NavigationDataEvaluationFilter()
 : mitk::NavigationDataToNavigationDataFilter()
 {
 
 }
 
 
 mitk::NavigationDataEvaluationFilter::~NavigationDataEvaluationFilter()
 {
 
 }
 
 void mitk::NavigationDataEvaluationFilter::GenerateData()
 {
 
     this->CreateOutputsForAllInputs(); // make sure that we have the same number of outputs as inputs
     this->CreateMembersForAllInputs();
 
     /* update outputs with tracking data from tools */
     for (unsigned int i = 0; i < this->GetNumberOfOutputs() ; ++i)
     {
       //first copy outputs to inputs
       mitk::NavigationData* output = this->GetOutput(i);
       assert(output);
       const mitk::NavigationData* input = this->GetInput(i);
       assert(input);
       if (input->IsDataValid() == false) {output->SetDataValid(false);}
       else {output->Graft(input);}
 
       //then save statistics
       if(input->IsDataValid())
         {
         m_LoggedPositions[i].push_back(input->GetPosition());
         m_LoggedQuaternions[i].push_back(input->GetOrientation());
         }
       else 
         {
         m_InavildSamples[i]++;
         }
     }
   
 }
 void mitk::NavigationDataEvaluationFilter::CreateMembersForAllInputs()
 {
   while(this->m_LoggedPositions.size() < this->GetNumberOfInputs())
     {
     std::pair<int,std::vector<mitk::Point3D>> newElement(m_LoggedPositions.size(),std::vector<mitk::Point3D>());
     m_LoggedPositions.insert(newElement);
     }
   while(this->m_LoggedQuaternions.size() < this->GetNumberOfInputs())
     {
     std::pair<int,std::vector<mitk::Quaternion>> newElement(m_LoggedQuaternions.size(),std::vector<mitk::Quaternion>());
     m_LoggedQuaternions.insert(newElement);
     }
   while(this->m_InavildSamples.size() < this->GetNumberOfInputs())
     {
     std::pair<int,int> newElement(m_LoggedQuaternions.size(),0);
     m_InavildSamples.insert(newElement);
     }
 
   
 }
 
 void mitk::NavigationDataEvaluationFilter::ResetStatistic()
 {
 for (int i = 0; i < m_LoggedPositions.size(); i++) m_LoggedPositions[i] = std::vector<mitk::Point3D>();
 for (int i = 0; i < m_LoggedQuaternions.size(); i++) m_LoggedQuaternions[i] = std::vector<mitk::Quaternion>();
 for (int i = 0; i < m_InavildSamples.size(); i++) m_InavildSamples[i] = 0;
 }
+
+int mitk::NavigationDataEvaluationFilter::GetNumberOfAnalysedNavigationData(int input)
+{
+return this->m_LoggedPositions[input].size();
+}
+
+
+mitk::Point3D mitk::NavigationDataEvaluationFilter::GetPositionMean(int input)
+{
+mitk::Point3D returnValue;
+returnValue.Fill(0);
+
+for (int i=0; i<m_LoggedPositions[input].size(); i++)
+  {
+  returnValue[0] += m_LoggedPositions[input].at(i)[0];
+  returnValue[1] += m_LoggedPositions[input].at(i)[1];
+  returnValue[2] += m_LoggedPositions[input].at(i)[2];
+  }
+
+returnValue[0] /= m_LoggedPositions[input].size();
+returnValue[1] /= m_LoggedPositions[input].size();
+returnValue[2] /= m_LoggedPositions[input].size();
+
+return returnValue;
+}
+
+mitk::Vector3D mitk::NavigationDataEvaluationFilter::GetPositionStandardDerivation(int input)
+{
+mitk::Vector3D returnValue;
+//TODO
+return returnValue;
+}
+
+mitk::Quaternion mitk::NavigationDataEvaluationFilter::GetQuaternionMean(int input)
+{
+mitk::Quaternion returnValue;
+
+returnValue[0] = 0;
+returnValue[1] = 0;
+returnValue[2] = 0;
+returnValue[3] = 0;
+
+for (int i=0; i<m_LoggedQuaternions[input].size(); i++)
+  {
+  returnValue[0] += m_LoggedQuaternions[input].at(i)[0];
+  returnValue[1] += m_LoggedQuaternions[input].at(i)[1];
+  returnValue[2] += m_LoggedQuaternions[input].at(i)[2];
+  returnValue[3] += m_LoggedQuaternions[input].at(i)[3];
+  }
+
+returnValue[0] /= m_LoggedQuaternions[input].size();
+returnValue[1] /= m_LoggedQuaternions[input].size();
+returnValue[2] /= m_LoggedQuaternions[input].size();
+returnValue[3] /= m_LoggedQuaternions[input].size();
+
+return returnValue;
+}
+
+mitk::Quaternion mitk::NavigationDataEvaluationFilter::GetQuaternionStandardDerivation(int input)
+{
+mitk::Quaternion returnValue;
+//TODO
+return returnValue;
+}
+
+
+double mitk::NavigationDataEvaluationFilter::GetPositionErrorMean(int input)
+{
+double returnValue = 0.0;
+mitk::Point3D mean = this->GetPositionMean(input);
+
+for(int i=0; i<m_LoggedPositions[input].size(); i++)
+  {
+  returnValue += mean.EuclideanDistanceTo(m_LoggedPositions[input].at(i));
+  }
+returnValue /= m_LoggedPositions[input].size();
+
+return returnValue;
+}
+
+double mitk::NavigationDataEvaluationFilter::GetPositionErrorStandardDerication(int input)
+{
+double returnValue = 0.0;
+//TODO
+return returnValue;
+}
+
+double mitk::NavigationDataEvaluationFilter::GetPositionErrorRMS(int input)
+{
+double returnValue = 0.0;
+
+mitk::Point3D mean = this->GetPositionMean(input);
+
+for(int i=0; i<m_LoggedPositions[input].size(); i++)
+  {
+  returnValue += pow(mean.EuclideanDistanceTo(m_LoggedPositions[input].at(i)),2);
+  }
+returnValue /= m_LoggedPositions[input].size();
+returnValue = sqrt(returnValue);
+
+return returnValue;
+}
+
+double mitk::NavigationDataEvaluationFilter::GetPositionErrorMedian(int input)
+{
+double returnValue = 0.0;
+//TODO
+return returnValue;
+}
+
+double mitk::NavigationDataEvaluationFilter::GetQuaternionErrorMean(int input)
+{
+double returnValue = 0.0;
+//TODO
+return returnValue;
+}
+
+double mitk::NavigationDataEvaluationFilter::GetQuaternionErrorStandardDerication(int input)
+{
+double returnValue = 0.0;
+//TODO
+return returnValue;
+}
+
+double mitk::NavigationDataEvaluationFilter::GetQuaternionErrorRMS(int input)
+{
+double returnValue = 0.0;
+//TODO
+return returnValue;
+}
+
+double mitk::NavigationDataEvaluationFilter::GetQuaternionErrorMedian(int input)
+{
+double returnValue = 0.0;
+//TODO
+return returnValue;
+}
+
+int GetNumberOfInvalidSamples(int input)
+{
+int returnValue = 0;
+//TODO
+return returnValue;
+}
+
+double GetPercentageOfInvalidSamples(int input)
+{
+double returnValue = 0.0;
+//TODO
+return returnValue;
+}
\ No newline at end of file
diff --git a/Modules/IGT/IGTFilters/mitkNavigationDataEvaluationFilter.h b/Modules/IGT/IGTFilters/mitkNavigationDataEvaluationFilter.h
index 15aa169d17..5565e6665b 100644
--- a/Modules/IGT/IGTFilters/mitkNavigationDataEvaluationFilter.h
+++ b/Modules/IGT/IGTFilters/mitkNavigationDataEvaluationFilter.h
@@ -1,93 +1,95 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision: 16011 $
 
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
 
 #ifndef MITKNavigationDataEvaluationFilter_H_HEADER_INCLUDED_
 #define MITKNavigationDataEvaluationFilter_H_HEADER_INCLUDED_
 
 #include <mitkNavigationDataToNavigationDataFilter.h>
 
 #include <itkQuaternionRigidTransform.h>
 #include <itkTransform.h>
 
 
 namespace mitk {
 
   /**Documentation
   * \brief NavigationDataEvaluationFilter calculates statistical data (mean value, mean error, etc.) on the input navigation data.
   * Input navigation data are set 1:1 on output navigation data.
   *
   * \ingroup IGT
   */
   class MitkIGT_EXPORT NavigationDataEvaluationFilter : public NavigationDataToNavigationDataFilter
   {
 
   public:
 
     mitkClassMacro(NavigationDataEvaluationFilter, NavigationDataToNavigationDataFilter);
     itkNewMacro(Self);
 
     /** @brief Resets all statistics and starts again. */
     void ResetStatistic();
 
     /** @return returns the number of analysed navigation datas for the specified input. */
     int GetNumberOfAnalysedNavigationData(int input);
+    int GetNumberOfInvalidSamples(int input);
+    double GetPercentageOfInvalidSamples(int input);
 
 
-    double GetPositionMean(int input);
-    double GetPositionStandardDerivation(int input);
+    mitk::Point3D GetPositionMean(int input);
+    mitk::Vector3D GetPositionStandardDerivation(int input);
 
-    double GetQuaternionMean(int input);
-    double GetQuaternionStandardDerivation(int input);
+    mitk::Quaternion GetQuaternionMean(int input);
+    mitk::Quaternion GetQuaternionStandardDerivation(int input);
     
 
     /** @return Returns the mean distance to the mean postion. */
     double GetPositionErrorMean(int input);
     double GetPositionErrorStandardDerication(int input);
     double GetPositionErrorRMS(int input);
     double GetPositionErrorMedian(int input);
     
     double GetQuaternionErrorMean(int input);
     double GetQuaternionErrorStandardDerication(int input);
     double GetQuaternionErrorRMS(int input);
     double GetQuaternionErrorMedian(int input);
     
     
   
   protected:
 
     NavigationDataEvaluationFilter();
     virtual ~NavigationDataEvaluationFilter();
 
     /**Documentation
     * \brief filter execute method
     *
     * transforms navigation data
     */
     virtual void GenerateData();
 
     /** @brief Creates the member variables which store all the statistical data for every input. */
     void CreateMembersForAllInputs();
 
     
     std::map<int,std::vector<mitk::Point3D>> m_LoggedPositions; //a map here, to have one list for every navigation data
     std::map<int,std::vector<mitk::Quaternion>> m_LoggedQuaternions;
     std::map<int,int> m_InavildSamples;
   };
 } // namespace mitk
 
 #endif /* MITKNavigationDataEvaluationFilter_H_HEADER_INCLUDED_ */
\ No newline at end of file