Added the auto tuning