buffering minor changes