Rewrite the partition found checking code and begin the non-by-name
find method