Refactored version to match base year and date