Module 2 final v2

Additional changes made