Some changes

I made some changes to complete the assignment