Some tuning up