Fix/all years

Final