add back isWithinSameYear