modified find method