Added "TODO" comments for the case of alwaysBuffer = true