Removed futures
Reinstated original iterator