Hw2 tested and corrected