Made national output year ahead selectable