Here are my initial changes