Updated for Hw4