Index: CLAM/test/UnitTests/TonalAnalysis/InstantTunningEstimatorTest.cxx
===================================================================
--- CLAM/test/UnitTests/TonalAnalysis/InstantTunningEstimatorTest.cxx	(revision 10374)
+++ CLAM/test/UnitTests/TonalAnalysis/InstantTunningEstimatorTest.cxx	(working copy)
@@ -64,12 +64,12 @@
 	void assertFoundCenterIs(double expectedCenter, double expectedStrength,
 			unsigned nPeaks, double * peakPositions, double * peakValues)
 	{
-		InstantTunningEstimator tunningEstimator(0.0,1);
+		InstantTunningEstimator tunningEstimator;
 		
 		std::vector< std::pair<double,double> > peaks;
 		for(unsigned i=0; i<nPeaks; ++i) 
 		{
-			peaks.push_back( std::pair<double,double>(peakPositions[i],peakValues[i]));
+			peaks.push_back( std::make_pair(peakPositions[i],peakValues[i]));
 		}
 		
 		tunningEstimator.doIt(peaks);
@@ -147,12 +147,12 @@
 	void testSeveralFrames_withoutInertia()
 	{
 		std::vector< std::pair<double,double> > peaks1;
-		peaks1.push_back( std::pair<double,double>(0.0, 8.0) );
-		peaks1.push_back( std::pair<double,double>(1.0, 8.0) );
+		peaks1.push_back( std::make_pair(0.0, 8.0) );
+		peaks1.push_back( std::make_pair(1.0, 8.0) );
 		
 		std::vector< std::pair<double,double> > peaks2;
-		peaks2.push_back( std::pair<double,double>(0.5, 8.0) );
-		peaks2.push_back( std::pair<double,double>(1.5, 8.0) );
+		peaks2.push_back( std::make_pair(0.5, 8.0) );
+		peaks2.push_back( std::make_pair(1.5, 8.0) );
 		
 		InstantTunningEstimator tunningEstimator(0.0,1);
 		tunningEstimator.doIt(peaks1);
@@ -166,12 +166,12 @@
 	void testSeveralFrames_withInertia()
 	{
 		std::vector< std::pair<double,double> > peaks1;
-		peaks1.push_back( std::pair<double,double>(0.0, 8.0) );
-		peaks1.push_back( std::pair<double,double>(1.0, 8.0) );
+		peaks1.push_back( std::make_pair(0.0, 8.0) );
+		peaks1.push_back( std::make_pair(1.0, 8.0) );
 		
 		std::vector< std::pair<double,double> > peaks2;
-		peaks2.push_back( std::pair<double,double>(0.5, 8.0) );
-		peaks2.push_back( std::pair<double,double>(1.5, 8.0) );
+		peaks2.push_back( std::make_pair(0.5, 8.0) );
+		peaks2.push_back( std::make_pair(1.5, 8.0) );
 
 		InstantTunningEstimator tunningEstimator(0.0,1);
 		tunningEstimator.setInertia(.4);
Index: CLAM/src/Processing/Analysis/Tonal/InstantTunningEstimator.hxx
===================================================================
--- CLAM/src/Processing/Analysis/Tonal/InstantTunningEstimator.hxx	(revision 10374)
+++ CLAM/src/Processing/Analysis/Tonal/InstantTunningEstimator.hxx	(working copy)
@@ -50,7 +50,7 @@
 	unsigned _binsPerSemitone;
 	double _inertia;
 public:
-	InstantTunningEstimator(double inertia=0.0, unsigned binsPerSemitone=3)
+	InstantTunningEstimator(double inertia=0.0, unsigned binsPerSemitone=1)
 		: _inertia(inertia)
 		, _binsPerSemitone(binsPerSemitone)
 	{
@@ -64,17 +64,6 @@
 	{
 		_inertia=inertia;
 	}
-	void doIt(unsigned int nPeaks, const double * peakPositions, const double * peakValues)
-	{
-		_fasorX*=_inertia;
-		_fasorY*=_inertia;
-		for (unsigned int peak=0; peak<nPeaks; peak++)
-		{
-			double radiantTunning=peakPositions[peak]*2*M_PI/_binsPerSemitone;
-			_fasorX+=cos(radiantTunning)*peakValues[peak];
-			_fasorY+=sin(radiantTunning)*peakValues[peak];
-		}
-	}
 	// TODO: This function is taken by S&R of the previous one, no test!!
 	void doIt(const std::vector<std::pair<double, double> >& peaks)
 	{
Index: CLAM/src/Processing/Analysis/Tonal/ChordExtractor.hxx
===================================================================
--- CLAM/src/Processing/Analysis/Tonal/ChordExtractor.hxx	(revision 10374)
+++ CLAM/src/Processing/Analysis/Tonal/ChordExtractor.hxx	(working copy)
@@ -64,7 +64,7 @@
 		, _constantQFolder(_constantQTransform.getK(), binsPerOctave)
 		, _fourierTransform(_constantQTransform.getfftlength(),1,0)
 		, _circularPeakPicking(binsPerOctave, /*scaling factor*/ 12.0/binsPerOctave)
-		, _instantTunningEstimator(/*Inertia*/ 1.0, /*bins per semitone*/  1)
+		, _instantTunningEstimator(/*Inertia*/ 1.0)
 		, _circularPeakTunner(/*reference tunning*/ 0.0)
 		, _filter(0.7)
 		, _tunningEnabled(true)