Added doInfinites back in (untested!)