changing conditionals and expressions