Updated zip api to be more effective!