My changes of Assignment 2