Initial changes for hw4