Improve temp unzip mechanism