changed code to reflect second conditionals screencast