inital search in place
cleanup fix