Here are the changes I made