remove check and add independent iterator