Moved the find methods to be all together in the code