Feature user configuable v2

user configuable