added more tuning