Integrated settings features added by Matt