switch to findWhere