Improve settle performance