Updated for assignment number 2