Added tweaks in lesson 17