added support for "and" and vs.