Revert "TESTING Revert "Find command optimization""

This reverts commit b459b6bf68ac614214fb2dd150c651c47c612ac6.