Final changes for HW3