Improved zip handling
new version