Added BetterFindBuffer