Working on both envs - Chapter 7
Conflicts resolved