Switch back to iteration code

Why all the timeouts datastore?