added a big part of lesson 2