More quick changes