Made changes for HW4