Changed to use one year list rather than many