Added conditionals expressions and equality