update settings, test 2, fix3