Add buf cycling