Cleanup
update buffer
update