New settings, old settings refactor
version-16