Updated paging to take into account the year