Code tunning finalized