use new improved terms for buffer and stuff