Added current week/year logic