Added functions from zip.inc