some more tuning