Enhancement/buffer upgrade