Updated and Tested Hw07