More updates for exercise 3