Add year to sort too