Prod ONLY: increased buffer, removed volatile.