buffering changes; hopefully fix a bug