added zip and made last changes