Some more tuning