Version with external search - RC1