added zip handling