Made it Zip friendly