Made TAZ setting a bit better.