Updated year logic to work after the new year