Fixed issue with question 2. Updated zip. Final submission.