fixed contains + added ncontains condition