Dinamic year, table fixes