Updated files for second review