diff --git a/R/Tables/AVOe_R.xls b/R/Tables/AVOe_R.xls
deleted file mode 100644
index 20cc56a9ce25c3d51b8c50e51728efb4e18039a7..0000000000000000000000000000000000000000
Binary files a/R/Tables/AVOe_R.xls and /dev/null differ
diff --git a/R/Tables/A_Volkszaehlungen.xls b/R/Tables/A_Volkszaehlungen.xls
deleted file mode 100644
index 8cdf54749a6cc99045de2fcd8fc0294c4b29a998..0000000000000000000000000000000000000000
Binary files a/R/Tables/A_Volkszaehlungen.xls and /dev/null differ
diff --git a/R/Tables/A_Volkszaehlungen.xlsx b/R/Tables/A_Volkszaehlungen.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..c0faf655b151f8b37b72396f3fdf3d1c4076a55e
Binary files /dev/null and b/R/Tables/A_Volkszaehlungen.xlsx differ
diff --git a/R/ValuationTables_Austria_Census.R b/R/ValuationTables_Austria_Census.R
index cad3bbc1d892861eb2e1e81e4f4a1749090ed8eb..7d6cf431767cdb6b8948fe185eae8b1b9ba622e0 100644
--- a/R/ValuationTables_Austria_Census.R
+++ b/R/ValuationTables_Austria_Census.R
@@ -4,7 +4,7 @@
 # rm(frame_files)
 # setwd(dirname(PATH))
 
-library("gdata")
+library("openxlsx")
 
 
 
@@ -12,51 +12,44 @@ library("gdata")
 ### Volkszählungen Österreich
 ###############################################################################
 
-a.vz.dataM=read.xls(
-  "Tables/A_Volkszaehlungen.xls",
-  sheet="Austria_M",
-  skip=2,
-  header=TRUE
-)
-a.vz.dataF=read.xls(
-  "Tables/A_Volkszaehlungen.xls",
-  sheet="Austria_F",
-  skip=2,
-  header=TRUE
-)
+a.vz.dataM = openxlsx::read.xlsx("Tables/A_Volkszaehlungen.xlsx", sheet="Austria_M",
+                                 startRow = 3, colNames = TRUE)
+a.vz.dataF = openxlsx::read.xlsx("Tables/A_Volkszaehlungen.xlsx", sheet="Austria_F",
+                                 startRow = 3, colNames = TRUE)
+
 censtable = function(data, name, qslot, baseYear=1900) {
   qx=data[names(data)==qslot];
   ix=complete.cases(qx);
   valuationTable.period(name=name, ages=data$x[ix], deathProbs=qx[ix,], baseYear=baseYear)
 }
 
-mort.AT.census.1869.male = censtable(a.vz.dataM, name="ÖVSt 1868/71 M", baseYear=1869, qslot="X1868.71");
-mort.AT.census.1880.male = censtable(a.vz.dataM, name="ÖVSt 1879/82 M", baseYear=1880, qslot="X1879.82");
-mort.AT.census.1890.male = censtable(a.vz.dataM, name="ÖVSt 1889/92 M", baseYear=1890, qslot="X1889.92");
-mort.AT.census.1900.male = censtable(a.vz.dataM, name="ÖVSt 1899/1902 M", baseYear=1900, qslot="X1899.1902");
-mort.AT.census.1910.male = censtable(a.vz.dataM, name="ÖVSt 1909/12 M", baseYear=1910, qslot="X1909.12");
-mort.AT.census.1931.male = censtable(a.vz.dataM, name="ÖVSt 1930/33 M", baseYear=1931, qslot="X1930.33");
-mort.AT.census.1951.male = censtable(a.vz.dataM, name="ÖVSt 1949/51 M", baseYear=1951, qslot="X1949.51");
-mort.AT.census.1961.male = censtable(a.vz.dataM, name="ÖVSt 1959/61 M", baseYear=1961, qslot="X1959.61");
-mort.AT.census.1971.male = censtable(a.vz.dataM, name="ÖVSt 1970/72 M", baseYear=1971, qslot="X1970.72");
-mort.AT.census.1981.male = censtable(a.vz.dataM, name="ÖVSt 1980/82 M", baseYear=1981, qslot="X1980.82");
-mort.AT.census.1991.male = censtable(a.vz.dataM, name="ÖVSt 1990/92 M", baseYear=1991, qslot="X1990.92");
-mort.AT.census.2001.male = censtable(a.vz.dataM, name="ÖVSt 2000/02 M", baseYear=2001, qslot="X2000.02");
-mort.AT.census.2011.male = censtable(a.vz.dataM, name="ÖVSt 2010/2012 M", baseYear=2011, qslot="X2010.12");
+mort.AT.census.1869.male = censtable(a.vz.dataM, name="ÖVSt 1868/71 M",   baseYear=1869, qslot="1868/71");
+mort.AT.census.1880.male = censtable(a.vz.dataM, name="ÖVSt 1879/82 M",   baseYear=1880, qslot="1879/82");
+mort.AT.census.1890.male = censtable(a.vz.dataM, name="ÖVSt 1889/92 M",   baseYear=1890, qslot="1889/92");
+mort.AT.census.1900.male = censtable(a.vz.dataM, name="ÖVSt 1899/1902 M", baseYear=1900, qslot="1899/1902");
+mort.AT.census.1910.male = censtable(a.vz.dataM, name="ÖVSt 1909/12 M",   baseYear=1910, qslot="1909/12");
+mort.AT.census.1931.male = censtable(a.vz.dataM, name="ÖVSt 1930/33 M",   baseYear=1931, qslot="1930/33");
+mort.AT.census.1951.male = censtable(a.vz.dataM, name="ÖVSt 1949/51 M",   baseYear=1951, qslot="1949/51");
+mort.AT.census.1961.male = censtable(a.vz.dataM, name="ÖVSt 1959/61 M",   baseYear=1961, qslot="1959/61");
+mort.AT.census.1971.male = censtable(a.vz.dataM, name="ÖVSt 1970/72 M",   baseYear=1971, qslot="1970/72");
+mort.AT.census.1981.male = censtable(a.vz.dataM, name="ÖVSt 1980/82 M",   baseYear=1981, qslot="1980/82");
+mort.AT.census.1991.male = censtable(a.vz.dataM, name="ÖVSt 1990/92 M",   baseYear=1991, qslot="1990/92");
+mort.AT.census.2001.male = censtable(a.vz.dataM, name="ÖVSt 2000/02 M",   baseYear=2001, qslot="2000/02");
+mort.AT.census.2011.male = censtable(a.vz.dataM, name="ÖVSt 2010/2012 M", baseYear=2011, qslot="2010/12");
 
-mort.AT.census.1869.female = censtable(a.vz.dataF, name="ÖVSt 1868/71 F", baseYear=1869, qslot="X1868.71");
-mort.AT.census.1880.female = censtable(a.vz.dataF, name="ÖVSt 1879/82 F", baseYear=1880, qslot="X1879.82");
-mort.AT.census.1890.female = censtable(a.vz.dataF, name="ÖVSt 1889/92 F", baseYear=1890, qslot="X1889.92");
-mort.AT.census.1900.female = censtable(a.vz.dataF, name="ÖVSt 1899/1902 F", baseYear=1900, qslot="X1899.1902");
-mort.AT.census.1910.female = censtable(a.vz.dataF, name="ÖVSt 1909/12 F", baseYear=1910, qslot="X1909.12");
-mort.AT.census.1931.female = censtable(a.vz.dataF, name="ÖVSt 1930/33 F", baseYear=1931, qslot="X1930.33");
-mort.AT.census.1951.female = censtable(a.vz.dataF, name="ÖVSt 1949/51 F", baseYear=1951, qslot="X1949.51");
-mort.AT.census.1961.female = censtable(a.vz.dataF, name="ÖVSt 1959/61 F", baseYear=1961, qslot="X1959.61");
-mort.AT.census.1971.female = censtable(a.vz.dataF, name="ÖVSt 1970/72 F", baseYear=1971, qslot="X1970.72");
-mort.AT.census.1981.female = censtable(a.vz.dataF, name="ÖVSt 1980/82 F", baseYear=1981, qslot="X1980.82");
-mort.AT.census.1991.female = censtable(a.vz.dataF, name="ÖVSt 1990/92 F", baseYear=1991, qslot="X1990.92");
-mort.AT.census.2001.female = censtable(a.vz.dataF, name="ÖVSt 2000/02 F", baseYear=2001, qslot="X2000.02");
-mort.AT.census.2011.female = censtable(a.vz.dataF, name="ÖVSt 2010/2012 F", baseYear=2011, qslot="X2010.12");
+mort.AT.census.1869.female = censtable(a.vz.dataF, name="ÖVSt 1868/71 F",   baseYear=1869, qslot="1868/71");
+mort.AT.census.1880.female = censtable(a.vz.dataF, name="ÖVSt 1879/82 F",   baseYear=1880, qslot="1879/82");
+mort.AT.census.1890.female = censtable(a.vz.dataF, name="ÖVSt 1889/92 F",   baseYear=1890, qslot="1889/92");
+mort.AT.census.1900.female = censtable(a.vz.dataF, name="ÖVSt 1899/1902 F", baseYear=1900, qslot="1899/1902");
+mort.AT.census.1910.female = censtable(a.vz.dataF, name="ÖVSt 1909/12 F",   baseYear=1910, qslot="1909/12");
+mort.AT.census.1931.female = censtable(a.vz.dataF, name="ÖVSt 1930/33 F",   baseYear=1931, qslot="1930/33");
+mort.AT.census.1951.female = censtable(a.vz.dataF, name="ÖVSt 1949/51 F",   baseYear=1951, qslot="1949/51");
+mort.AT.census.1961.female = censtable(a.vz.dataF, name="ÖVSt 1959/61 F",   baseYear=1961, qslot="1959/61");
+mort.AT.census.1971.female = censtable(a.vz.dataF, name="ÖVSt 1970/72 F",   baseYear=1971, qslot="1970/72");
+mort.AT.census.1981.female = censtable(a.vz.dataF, name="ÖVSt 1980/82 F",   baseYear=1981, qslot="1980/82");
+mort.AT.census.1991.female = censtable(a.vz.dataF, name="ÖVSt 1990/92 F",   baseYear=1991, qslot="1990/92");
+mort.AT.census.2001.female = censtable(a.vz.dataF, name="ÖVSt 2000/02 F",   baseYear=2001, qslot="2000/02");
+mort.AT.census.2011.female = censtable(a.vz.dataF, name="ÖVSt 2010/2012 F", baseYear=2011, qslot="2010/12");
 
 mort.AT.census.2001.unisex = valuationTable.mixed(table1=mort.AT.census.2001.male, table2=mort.AT.census.2001.female)