commiting some changes to iterator and subscriber, but not building yet