Updated hw4-1