Adding KyoungSoo's changes for setting buffer sizes