BUFFER SOLUTION