Reworked buffer event