[DEV] buffer manager better work