removed findWhere