Improved find()