updated for hw4