Added infinite horizon possibility