Iterator changes by Pawel