slight modification to Zip class