Buffer: enhanced but not yet ready version