next round of changes/tuning