Update for Homework4.2