Now handles single and condition