Updated assignment2