Remove Zip, Change unfold/iterate