Added correct conditionals.