Added conditionals.