removed recursive search