added todo; redundant zip