new build; allow for endless mode