added buffer thing, maybe useful