Here are the final Changes I made