Initial changes for HW4