Checking in KyoungSoo's changes for dynamically setting buffer sizes