reorganied setting updates