Improves long forecast functionality