Made buffering an option