Switch to simplfied ZIP