CR feedback
Add the binary search to only init once