Using final versions and using iterator to ease debugging