Updates to find method