Homework2 Final Fixed issue