Chapter 12: Added conditionals