Edited For Hw6