hw3 almost fixed