Added conditionals