diff --git a/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssGradientImage.cpp b/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssGradientImage.cpp
new file mode 100644
index 0000000000..f14b22bb39
--- /dev/null
+++ b/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssGradientImage.cpp
@@ -0,0 +1,109 @@
+/*=========================================================================
+
+Program:   Medical Imaging & Interaction Toolkit
+Language:  C++
+Date:      $Date: 2008-02-08 11:19:03 +0100 (Fr, 08 Feb 2008) $
+Version:   $Revision: 11989 $
+
+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 __mitkTbssGradientImage__cpp
+#define __mitkTbssGradientImage__cpp
+
+
+#include "mitkTbssGradientImage.h"
+#include "itkImageRegionIterator.h"
+#include "itkImageRegionConstIterator.h"
+#include "mitkImageCast.h"
+
+
+
+
+mitk::TbssGradientImage::TbssGradientImage()
+{
+
+}
+
+
+void mitk::TbssGradientImage::InitializeFromVectorImage()
+{
+  if(!m_Image)
+  {
+    MITK_INFO << "TBSS Gradient Image could not be initialized. Set all members first!" << std::endl;
+    return;
+  }
+
+
+  typedef itk::Image<float,3> ImgType;
+  ImgType::Pointer img = ImgType::New();
+  img->SetSpacing( m_Image->GetSpacing() );   // Set the image spacing
+  img->SetOrigin( m_Image->GetOrigin() );     // Set the image origin
+  img->SetDirection( m_Image->GetDirection() );  // Set the image direction
+  img->SetLargestPossibleRegion( m_Image->GetLargestPossibleRegion());
+  img->SetBufferedRegion( m_Image->GetLargestPossibleRegion() );
+  img->Allocate();
+
+  InitializeByItk( img.GetPointer(), 1, 3 );
+
+  itk::ImageRegionIterator<ImgType> itw (img, img->GetLargestPossibleRegion() );
+  itw = itw.Begin();
+
+  itk::ImageRegionConstIterator<ImageType> itr (m_Image, m_Image->GetLargestPossibleRegion() );
+  itr = itr.Begin();
+
+  while(!itr.IsAtEnd())
+  {
+    itw.Set(itr.Get().GetElement(0));
+    ++itr;
+    ++itw;
+  }
+
+
+  SetImportVolume(img->GetBufferPointer());//, 0, 0, CopyMemory);
+
+  m_DisplayIndex = 0;
+  MITK_INFO << "Tbss-Image successfully initialized.";
+
+}
+
+
+void mitk::TbssGradientImage::SetDisplayIndexForRendering(int displayIndex)
+{
+  MITK_INFO << "displayindex: " << displayIndex;
+  int index = displayIndex;
+  int vecLength = m_Image->GetVectorLength();
+  index = index > vecLength-1 ? vecLength-1 : index;
+  if( m_DisplayIndex != index )
+  {
+    typedef itk::Image<float,3> ImgType;
+    ImgType::Pointer img = ImgType::New();
+    CastToItkImagImageTypee<ImgType>(this, img);
+
+    itk::ImageRegionIterator<ImgType> itw (img, img->GetLargestPossibleRegion() );
+    itw = itw.Begin();
+
+    itk::ImageRegionConstIterator<ImageType> itr (m_Image, m_Image->GetLargestPossibleRegion() );
+    itr = itr.Begin();
+
+    while(!itr.IsAtEnd())
+    {
+      itw.Set(itr.Get().GetElement(index));
+      ++itr;
+      ++itw;
+    }
+  }
+
+  m_DisplayIndex = index;
+}
+
+
+
+#endif /* __mitkTbssGradientImage__cpp */
diff --git a/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssGradientImage.h b/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssGradientImage.h
new file mode 100644
index 0000000000..59806db86d
--- /dev/null
+++ b/Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssGradientImage.h
@@ -0,0 +1,97 @@
+/*=========================================================================
+
+Program:   Medical Imaging & Interaction Toolkit
+Language:  C++
+Date:      $Date: 2008-02-07 17:17:57 +0100 (Do, 07 Feb 2008) $
+Version:   $Revision: 11989 $
+
+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 __mitkTbssGradientImage__h
+#define __mitkTbssGradientImage__h
+
+#include "mitkImage.h"
+#include "itkVectorImage.h"
+#include "mitkImageCast.h"
+#include "MitkDiffusionImagingExports.h"
+
+namespace mitk 
+{
+
+  /**
+  * \brief this class encapsulates tbss gradient images (vectorimages not
+  * yet supported by mitkImage)
+  */
+
+  class MitkDiffusionImaging_EXPORT TbssGradientImage : public Image
+  {
+
+  public:
+
+    typedef itk::VectorImage<int, 3> ImageType;
+
+
+    typedef itk::Index<3> IndexType;
+    //typedef typename std::vector <Index<3> > RoiType;
+
+    mitkClassMacro( TbssGradientImage, Image )
+    itkNewMacro(Self)
+
+
+
+
+
+    //void SetRequestedRegionToLargestPossibleReg tbssRoi->SetTbssType(mitk::TbssImage<char>::ROI);ion();
+    //bool RequestedRegionIsOutsideOfTheBufferedRegion();
+    //virtual bool VerifyRequestedRegion();
+    //void SetRequestedRegion(itk::DataObject *data);
+
+    ImageType::Pointer GetImage()
+    {
+      return m_Image;
+    }
+    void SetImage(ImageType::Pointer image )
+    {
+      this->m_Image = image;
+    }
+
+
+    void InitializeFromImage()
+    {
+      MITK_INFO << "make an mitk image that can be shown by mitk";
+      this->InitializeByItk(m_Image.GetPointer(),1,1);
+    }
+
+
+    void InitializeFromVectorImage();
+
+    void SetDisplayIndexForRendering(int displayIndex);
+
+
+
+  protected:
+
+    TbssGradientImage();
+
+    virtual ~TbssGradientImage(){}
+
+    ImageType::Pointer m_Image;
+
+    int m_DisplayIndex;
+
+  };
+
+
+
+} // namespace mitk
+
+#endif /* __mitkTbssGradientImage__h */
diff --git a/Modules/DiffusionImaging/files.cmake b/Modules/DiffusionImaging/files.cmake
index 3948551288..81ab221a08 100644
--- a/Modules/DiffusionImaging/files.cmake
+++ b/Modules/DiffusionImaging/files.cmake
@@ -1,173 +1,172 @@
 SET(CPP_FILES
 
   # DicomImport
   DicomImport/mitkDicomDiffusionImageReader.cpp
   DicomImport/mitkGroupDiffusionHeadersFilter.cpp
   DicomImport/mitkDicomDiffusionImageHeaderReader.cpp
   DicomImport/mitkGEDicomDiffusionImageHeaderReader.cpp
   DicomImport/mitkPhilipsDicomDiffusionImageHeaderReader.cpp
   DicomImport/mitkSiemensDicomDiffusionImageHeaderReader.cpp
   DicomImport/mitkSiemensMosaicDicomDiffusionImageHeaderReader.cpp
 
   # DataStructures
   IODataStructures/mitkDiffusionImagingObjectFactory.cpp
 
   # DataStructures -> DWI
   IODataStructures/DiffusionWeightedImages/mitkDiffusionImageHeaderInformation.cpp
   IODataStructures/DiffusionWeightedImages/mitkDiffusionImageSource.cpp
   IODataStructures/DiffusionWeightedImages/mitkNrrdDiffusionImageReader.cpp
   IODataStructures/DiffusionWeightedImages/mitkNrrdDiffusionImageWriter.cpp
   IODataStructures/DiffusionWeightedImages/mitkNrrdDiffusionImageIOFactory.cpp
   IODataStructures/DiffusionWeightedImages/mitkNrrdDiffusionImageWriterFactory.cpp
   IODataStructures/DiffusionWeightedImages/mitkDiffusionImageSerializer.cpp
 
   # DataStructures -> QBall
   IODataStructures/QBallImages/mitkQBallImageSource.cpp
   IODataStructures/QBallImages/mitkNrrdQBallImageReader.cpp
   IODataStructures/QBallImages/mitkNrrdQBallImageWriter.cpp
   IODataStructures/QBallImages/mitkNrrdQBallImageIOFactory.cpp
   IODataStructures/QBallImages/mitkNrrdQBallImageWriterFactory.cpp
   IODataStructures/QBallImages/mitkQBallImage.cpp
   IODataStructures/QBallImages/mitkQBallImageSerializer.cpp
 
   # DataStructures -> Tensor
   IODataStructures/TensorImages/mitkTensorImageSource.cpp
   IODataStructures/TensorImages/mitkNrrdTensorImageReader.cpp
   IODataStructures/TensorImages/mitkNrrdTensorImageWriter.cpp
   IODataStructures/TensorImages/mitkNrrdTensorImageIOFactory.cpp
   IODataStructures/TensorImages/mitkNrrdTensorImageWriterFactory.cpp
   IODataStructures/TensorImages/mitkTensorImage.cpp
   IODataStructures/TensorImages/mitkTensorImageSerializer.cpp
 
   # DataStructures -> FiberBundle
   IODataStructures/FiberBundle/mitkFiberBundle.cpp
   IODataStructures/FiberBundle/mitkFiberBundleWriter.cpp
   IODataStructures/FiberBundle/mitkFiberBundleReader.cpp
   IODataStructures/FiberBundle/mitkFiberBundleIOFactory.cpp
   IODataStructures/FiberBundle/mitkFiberBundleWriterFactory.cpp
   IODataStructures/FiberBundle/mitkFiberBundleSerializer.cpp
   IODataStructures/FiberBundle/mitkParticle.cpp
   IODataStructures/FiberBundle/mitkParticleGrid.cpp
 
 # DataStructures -> FiberBundleX
   IODataStructures/FiberBundleX/mitkFiberBundleX.cpp
   IODataStructures/FiberBundleX/mitkFiberBundleXWriter.cpp
   IODataStructures/FiberBundleX/mitkFiberBundleXReader.cpp
   IODataStructures/FiberBundleX/mitkFiberBundleXIOFactory.cpp
   IODataStructures/FiberBundleX/mitkFiberBundleXWriterFactory.cpp
   IODataStructures/FiberBundleX/mitkFiberBundleXSerializer.cpp
   IODataStructures/FiberBundleX/mitkFiberBundleXThreadMonitor.cpp
 
 
   # DataStructures -> PlanarFigureComposite
   IODataStructures/PlanarFigureComposite/mitkPlanarFigureComposite.cpp
 
 
   # DataStructures -> Tbss
   IODataStructures/TbssImages/mitkTbssImageSource.cpp
   IODataStructures/TbssImages/mitkTbssRoiImageSource.cpp
   IODataStructures/TbssImages/mitkNrrdTbssImageReader.cpp
   IODataStructures/TbssImages/mitkNrrdTbssImageIOFactory.cpp
   IODataStructures/TbssImages/mitkNrrdTbssRoiImageReader.cpp
   IODataStructures/TbssImages/mitkNrrdTbssRoiImageIOFactory.cpp
   IODataStructures/TbssImages/mitkTbssImage.cpp
   IODataStructures/TbssImages/mitkTbssRoiImage.cpp
+  IODataStructures/TbssImages/mitkTbssGradientImage.cpp
   IODataStructures/TbssImages/mitkNrrdTbssImageWriter.cpp
   IODataStructures/TbssImages/mitkNrrdTbssImageWriterFactory.cpp
   IODataStructures/TbssImages/mitkNrrdTbssRoiImageWriter.cpp
   IODataStructures/TbssImages/mitkNrrdTbssRoiImageWriterFactory.cpp
   IODataStructures/TbssImages/mitkTbssImporter.cpp
 
 
   # Rendering
   Rendering/vtkMaskedProgrammableGlyphFilter.cpp
   Rendering/mitkCompositeMapper.cpp
   Rendering/mitkVectorImageVtkGlyphMapper3D.cpp
   Rendering/vtkOdfSource.cxx
   Rendering/vtkThickPlane.cxx
   Rendering/mitkOdfNormalizationMethodProperty.cpp
   Rendering/mitkOdfScaleByProperty.cpp
   Rendering/mitkFiberBundleMapper2D.cpp
   Rendering/mitkFiberBundleMapper3D.cpp
   Rendering/mitkFiberBundleXMapper3D.cpp
   Rendering/mitkFiberBundleXThreadMonitorMapper3D.cpp
   Rendering/mitkTbssImageMapper.cpp
   
 # Interactions
   Interactions/mitkFiberBundleInteractor.cpp
 
   # Algorithms
   Algorithms/mitkPartialVolumeAnalysisHistogramCalculator.cpp
   Algorithms/mitkPartialVolumeAnalysisClusteringCalculator.cpp
 
  # Tractography
  Tractography/itkStochasticTractographyFilter.h
 )
 
 SET(H_FILES
   # Rendering
   Rendering/mitkDiffusionImageMapper.h
   Rendering/mitkTbssImageMapper.h
   Rendering/mitkOdfVtkMapper2D.h
   Rendering/mitkFiberBundleMapper2D.h
   Rendering/mitkFiberBundleMapper3D.h
   Rendering/mitkFiberBundleXMapper3D.h
   Rendering/mitkFiberBundleXThreadMonitorMapper3D.h
 
   # Reconstruction
   Reconstruction/itkDiffusionQballReconstructionImageFilter.h
   Reconstruction/mitkTeemDiffusionTensor3DReconstructionImageFilter.h
   Reconstruction/itkAnalyticalDiffusionQballReconstructionImageFilter.h
   Reconstruction/itkPointShell.h
   Reconstruction/itkOrientationDistributionFunction.h
   Reconstruction/itkDiffusionIntravoxelIncoherentMotionReconstructionImageFilter.h
   Reconstruction/itkRegularizedIVIMLocalVariationImageFilter.h
   Reconstruction/itkRegularizedIVIMReconstructionFilter.h
   Reconstruction/itkRegularizedIVIMReconstructionSingleIteration.h
 
   # IO Datastructures
   IODataStructures/DiffusionWeightedImages/mitkDiffusionImage.h
-  IODataStructures/FiberBundle/itkSlowPolyLineParametricPath.h
-  #IODataStructures/TbssImages/mitkTbssImage.h
- # IODataStructures/TbssImages/mitkTbssRoiImage.h
+  IODataStructures/FiberBundle/itkSlowPolyLineParametricPath.h  
 
   # DataStructures -> FiberBundleX
   IODataStructures/FiberBundleX/mitkFiberBundleX.h
   IODataStructures/FiberBundleX/mitkFiberBundleXWriter.h
   IODataStructures/FiberBundleX/mitkFiberBundleXReader.h
   IODataStructures/FiberBundleX/mitkFiberBundleXIOFactory.h
   IODataStructures/FiberBundleX/mitkFiberBundleXWriterFactory.h
   IODataStructures/FiberBundleX/mitkFiberBundleXSerializer.h
   IODataStructures/FiberBundleX/mitkFiberBundleXThreadMonitor.h
 
 
 
   # Tractography
   Tractography/itkGibbsTrackingFilter.h
   Tractography/itkStochasticTractographyFilter.h
 
   # Algorithms
   Algorithms/itkDiffusionQballGeneralizedFaImageFilter.h
   Algorithms/itkDiffusionQballPrepareVisualizationImageFilter.h
   Algorithms/itkTensorDerivedMeasurementsFilter.h
   Algorithms/itkBrainMaskExtractionImageFilter.h
   Algorithms/itkB0ImageExtractionImageFilter.h
   Algorithms/itkTensorImageToDiffusionImageFilter.h
   Algorithms/itkTensorToL2NormImageFilter.h
   Algorithms/itkTractsToProbabilityImageFilter.h
   Algorithms/itkTractsToFiberEndingsImageFilter.h
   Algorithms/itkGaussianInterpolateImageFunction.h
   Algorithms/mitkPartialVolumeAnalysisHistogramCalculator.h
   Algorithms/mitkPartialVolumeAnalysisClusteringCalculator.h
   Algorithms/itkDiffusionTensorPrincipleDirectionImageFilter.h
   Algorithms/itkCartesianToPolarVectorImageFilter.h
   Algorithms/itkPolarToCartesianVectorImageFilter.h
 )
 
 SET( TOOL_FILES
 )
 
 IF(WIN32)
 ENDIF(WIN32)
 
 #MITK_MULTIPLEX_PICTYPE( Algorithms/mitkImageRegistrationMethod-TYPE.cpp )