Removed bad dependencies, added zip and ?