diff --git a/plotting/panel.R b/plotting/panel.R
index d614239f5d35832cc00359e516025b6c6ecc5240..0501dcec5c183b407dd7ad274c6afb972fae2edb 100644
--- a/plotting/panel.R
+++ b/plotting/panel.R
@@ -4,7 +4,8 @@ library(ggplot2)
 panel = function (df_data, df_info, figdir, filedir, span=Inf) {
         
     # If there is not a dedicated figure directory it creats one
-    outdir = file.path(figdir, filedir, paste('span_', as.character(span), '_years', sep=''))
+    # outdir = file.path(figdir, filedir, paste('span_', as.character(span), '_years', sep=''))
+    outdir = file.path(figdir, filedir, '_years', sep='')
     if (!(file.exists(outdir))) {
         dir.create(outdir)
     }
@@ -16,7 +17,7 @@ panel = function (df_data, df_info, figdir, filedir, span=Inf) {
         ggplot(df_data, aes(x=Date, y=Qls)) +
         geom_line()
 
-
+    
  
     return (plot)
 } 
diff --git a/processing/extract.R b/processing/extract.R
index e7c593deeff43f5b2fd1f1027d559f495e762381..1bac2919aad5a921d7f4d5f2c6df81a51236249f 100644
--- a/processing/extract.R
+++ b/processing/extract.R
@@ -1,4 +1,6 @@
 library(tools)
+library(dplyr)
+# library(readr)
 
 # General information on station
 iStatut = c('0'='inconnu', 
@@ -80,31 +82,31 @@ extract_info = function (data_path, filedir, filename) {
     file_path = file.path(data_path, filedir, filename)
     infotxt = c(readLines(file_path, n=41))
     
-    info = list(code=trimws(substr(infotxt[11], 38, nchar(infotxt[11]))),
-                nom=trimws(substr(infotxt[12], 39, nchar(infotxt[12]))),
-                territoire=trimws(substr(infotxt[13], 39, nchar(infotxt[13]))),
-                L93X=as.numeric(substr(infotxt[16], 38, 50)),
-                L93Y=as.numeric(substr(infotxt[16], 52, 63)),
-                surface=as.numeric(substr(infotxt[19], 38, 50)),
-                statut=iStatut[trimws(substr(infotxt[26], 38, 50))],
-                finalite=iFinalite[trimws(substr(infotxt[26], 52, 56))],
-                type=iType[trimws(substr(infotxt[26], 58, 58))],
-                influence=iInfluence[trimws(substr(infotxt[26], 60, 60))],
-                debit=iDebit[trimws(substr(infotxt[26], 62, 62))],
-                QBE=iQBE[trimws(substr(infotxt[26], 72, 72))],
-                QME=iQME[trimws(substr(infotxt[26], 74, 74))],
-                QHE=iQHE[trimws(substr(infotxt[26], 76, 76))]
-                )
-    
-    df_info = data.frame(info, file_path=file_path)
+    df_info =
+        tibble(code=trimws(substr(infotxt[11], 38, nchar(infotxt[11]))),
+               nom=trimws(substr(infotxt[12], 39, nchar(infotxt[12]))),
+               territoire=trimws(substr(infotxt[13], 39, nchar(infotxt[13]))),
+               L93X=as.numeric(substr(infotxt[16], 38, 50)),
+               L93Y=as.numeric(substr(infotxt[16], 52, 63)),
+               surface=as.numeric(substr(infotxt[19], 38, 50)),
+               statut=iStatut[trimws(substr(infotxt[26], 38, 50))],
+               finalite=iFinalite[trimws(substr(infotxt[26], 52, 56))],
+               type=iType[trimws(substr(infotxt[26], 58, 58))],
+               influence=iInfluence[trimws(substr(infotxt[26], 60, 60))],
+               debit=iDebit[trimws(substr(infotxt[26], 62, 62))],
+               QBE=iQBE[trimws(substr(infotxt[26], 72, 72))],
+               QME=iQME[trimws(substr(infotxt[26], 74, 74))],
+               QHE=iQHE[trimws(substr(infotxt[26], 76, 76))],
+               file_path=file_path
+               )
     
     return (df_info)
 }
 
 # df_info = extract_info(
-#     "/home/louis/Documents/bouleau/INRAE/CDD_stationnarite/data",
-#     '',
-#     c('H5920011_HYDRO_QJM.txt', 'K4470010_HYDRO_QJM.txt'))
+    # "/home/louis/Documents/bouleau/INRAE/CDD_stationnarite/data",
+    # '',
+    # c('H5920011_HYDRO_QJM.txt', 'K4470010_HYDRO_QJM.txt'))
 
 
 # Extraction of data
@@ -143,19 +145,22 @@ extract_data = function (data_path, filedir, filename) {
     
     df_data = read.table(file_path,
                          header=TRUE,
-                         na.strings=c('     -99'),
+                         na.strings=c('     -99', ' -99.000'),
                          sep=';',
-                         skip=41)[,1:2]
-    
+                         skip=41)[,1:2]    
+
     df_info = extract_info(data_path, filedir, filename)
     code = df_info$code
     
-    df_data = cbind(df_data, code=code)
-
+    df_data = tibble(Date=as.Date(as.character(df_data$Date),
+                                  format="%Y%m%d"),
+                     df_data[-1],
+                     code=code)
+    
     return (df_data)
 }
 
 # df_data = extract_data(
-    # "/home/louis/Documents/bouleau/INRAE/CDD_stationnarite/data",
-    # '',
-    # c('H5920011_HYDRO_QJM.txt', 'K4470010_HYDRO_QJM.txt'))
+#     "/home/louis/Documents/bouleau/INRAE/CDD_stationnarite/data",
+#     '',
+#     c('H5920011_HYDRO_QJM.txt', 'K4470010_HYDRO_QJM.txt'))