First draft of Exercise 3.5.4 - two more if statements needed