change Find() interface