modifying non-zip handling