Integrate Tuning Changes into Main