Update up to first part of exercise 4