Added final changes for lesson 1