another zip refactor