Adding conditionals and comments.