All changes included except point 9 - zip file inclusion