start porting to new search