These are the changes I made.