updated, but iterator issues