Use of .some() rather then .filter() to improve efficiency