Version with exercise 3.5