Update with exercises 1 and 2