Changes from hw3