Solving issue #2: Adding conditionals