Buffer tanks for primary