Make buffer handler work
Use event handler