modify find function