added more find cond