Buffer scrapped
Quite working now