more changes for HW4