Tuned up the find method