added handling of non-default settings