Oops, problem with AND and ORs. Fixed