Change to use output zip