Finished both of the find functions