Add multiple buffer search
Before cleaning and replacing
Stable